Skip to content

Commit ad85d67

Browse files
lukasbachlukasbach
committed
Merge branch 'main' into feat/148-dnd-rework
# Conflicts: # .github/workflows/prerelease.yml # lerna-publish-summary.json # lerna.json # packages/autodemo/package.json # packages/blueprintjs-renderers/package.json # packages/core/package.json # packages/demodata/package.json # packages/docs/docs/changelog.mdx # packages/docs/package.json # yarn.lock
2 parents 43cbbaa + 6f5851d commit ad85d67

File tree

11 files changed

+48
-49
lines changed

11 files changed

+48
-49
lines changed

‎.github/workflows/prerelease.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,16 @@ jobs:
2727
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
2828
- name: Release info
2929
run: cat ./lerna-publish-summary.json
30+
- name: Update lockfile
31+
run: |
32+
echo "enableImmutableInstalls: false" > ./.yarnrc.yml
33+
yarn
34+
git checkout HEAD -- ./.yarnrc.yml
35+
env:
36+
CI: false
37+
- name: Push remaining changes
38+
uses: EndBug/add-and-commit@v9
39+
with:
40+
author_name: lukasbachbot
41+
author_email: [email protected]
42+
message: 'chore: tidy up after prerelease'

‎lerna-publish-summary.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"packageName":"react-complex-tree-autodemo","version":"2.3.7-alpha.0"},{"packageName":"react-complex-tree-blueprintjs-renderers","version":"2.3.7-alpha.0"},{"packageName":"react-complex-tree","version":"2.3.7-alpha.0"}]
1+
[{"packageName":"react-complex-tree-autodemo","version":"2.3.7"},{"packageName":"react-complex-tree-blueprintjs-renderers","version":"2.3.7"},{"packageName":"react-complex-tree","version":"2.3.7"}]

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"packages": ["packages/*"],
33
"npmClient": "yarn",
44
"useWorkspaces": true,
5-
"version": "2.3.7-alpha.1"
5+
"version": "2.3.7"
66
}

‎packages/autodemo/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-complex-tree-autodemo",
3-
"version": "2.3.7-alpha.1",
3+
"version": "2.3.7",
44
"main": "lib/index.js",
55
"types": "lib/index.d.ts",
66
"repository": {
@@ -23,10 +23,10 @@
2323
"@types/react-dom": "^18.0.7",
2424
"babel-jest": "^27.5.1",
2525
"babel-loader": "^9.1.0",
26-
"demodata": "^2.3.7-alpha.1",
26+
"demodata": "^2.3.7",
2727
"jest": "^26.6.3",
2828
"react": "^18.2.0",
29-
"react-complex-tree": "^2.3.7-alpha.1",
29+
"react-complex-tree": "^2.3.7",
3030
"react-dom": "^18.2.0",
3131
"react-test-renderer": "^18.2.0",
3232
"ts-node": "^10.7.0",

‎packages/blueprintjs-renderers/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-complex-tree-blueprintjs-renderers",
3-
"version": "2.3.7-alpha.1",
3+
"version": "2.3.7",
44
"main": "lib/index.js",
55
"types": "lib/index.d.ts",
66
"repository": {
@@ -26,10 +26,10 @@
2626
"@types/react-dom": "^18.0.7",
2727
"babel-jest": "^27.5.1",
2828
"babel-loader": "^9.1.0",
29-
"demodata": "^2.3.7-alpha.1",
29+
"demodata": "^2.3.7",
3030
"jest": "^26.6.3",
3131
"react": "^18.2.0",
32-
"react-complex-tree": "^2.3.7-alpha.1",
32+
"react-complex-tree": "^2.3.7",
3333
"react-dom": "^18.2.0",
3434
"react-test-renderer": "^18.2.0",
3535
"ts-node": "^10.7.0",

‎packages/core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-complex-tree",
3-
"version": "2.3.7-alpha.1",
3+
"version": "2.3.7",
44
"main": "lib/cjs/index.js",
55
"module": "lib/esm/index.js",
66
"esnext": "lib/esnext/index.js",
@@ -35,7 +35,7 @@
3535
"babel-jest": "^27.5.1",
3636
"babel-loader": "^9.1.0",
3737
"cpy-cli": "^3.1.1",
38-
"demodata": "^2.3.7-alpha.1",
38+
"demodata": "^2.3.7",
3939
"jest": "^29.2.2",
4040
"jest-dom": "^4.0.0",
4141
"jest-environment-jsdom": "^29.2.2",

‎packages/demodata/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "demodata",
3-
"version": "2.3.7-alpha.1",
3+
"version": "2.3.7",
44
"main": "lib/index.js",
55
"repository": {
66
"type": "git",

‎packages/docs/docs/changelog.mdx

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,13 @@ sidebar_position: 6
44

55
# Changelog
66

7-
## 2.3.7-alpha.0 - 10/03/2024
7+
## 2.3.7 - 15/03/2024
88

9-
### Features
10-
11-
- Make drop target depth in last-of-subtree locations dependent on x-coordinates of the mouse, allowing the user to
12-
drop in higher depths than the currently hovering item. This behavior is automatically used if `renderDepthOffset`
13-
on the renderers is set to a non-zero value. (#148)
14-
- This also applies when dropping at the top of an item where the item prior is of deeper depth, meaning that
15-
in this case the decision of dropping into the container above or directly above the hovering item will depend
16-
on the x-coordinate of the mouse.
17-
- Add `setDomFocus` argument to focus-item methods to provide an escape hatch to set the focus state of an item in RCT
18-
without updating the DOM focus. This defaults to true in all existing methods to maintain the current behavior if
19-
it is absent. (#336)
20-
- Allow customizing when a subtree is rendered or not with the new `shouldRenderChildren` prop. This can be used to
21-
create opening and closing animations on subtrees. See [Demo](https://rct.lukasbach.com/storybook/?path=/story/core-basic-examples--animated-expanding-and-collapsing)
22-
and [Demo Implementation](https://github.com/lukasbach/react-complex-tree/blob/main/packages/core/src/stories/BasicExamples.stories.tsx#L561) for details. (#333)
23-
24-
### Bug Fixes
9+
# Featureset revertion to the state of 2.3.6
2510

26-
- Fix a bug where the `parentId` property in the `renderItemsContainer` render method was incorrectly set to the tree id
27-
for the root container.
11+
I've noticed that I've accidentally been pushing a few experimental releases that were meant to be released
12+
as prerelease under the "Latest" tag in NPM. This reverts the latest release to the state of 2.3.6, the last
13+
proper "latest" release. Prereleases will from now on be released under the "prerelease" tag in NPM.
2814

2915

3016

‎packages/docs/docs/guides/rendering.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ renderItem={({ title, arrow, depth, context, children }) => (
119119
</button>
120120
</li>
121121
{children}
122-
<>
122+
</>
123123
)}
124124
```
125125

‎packages/docs/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "docs",
3-
"version": "2.3.7-alpha.1",
3+
"version": "2.3.7",
44
"private": true,
55
"scripts": {
66
"docusaurus": "docusaurus",
@@ -21,17 +21,17 @@
2121
"@mdx-js/react": "^1.6.21",
2222
"@svgr/webpack": "^6.5.1",
2323
"clsx": "^1.1.1",
24-
"demodata": "^2.3.7-alpha.1",
24+
"demodata": "^2.3.7",
2525
"docusaurus-plugin-react-docgen-typescript": "^1.0.2",
2626
"docusaurus-plugin-typedoc": "^0.18.0",
2727
"file-loader": "^6.2.0",
2828
"iframe-resizer": "^4.3.2",
2929
"iframe-resizer-react": "^1.1.0",
3030
"prism-react-renderer": "^1.2.1",
3131
"react": "^18.2.0",
32-
"react-complex-tree": "^2.3.7-alpha.1",
33-
"react-complex-tree-autodemo": "^2.3.7-alpha.1",
34-
"react-complex-tree-blueprintjs-renderers": "^2.3.7-alpha.1",
32+
"react-complex-tree": "^2.3.7",
33+
"react-complex-tree-autodemo": "^2.3.7",
34+
"react-complex-tree-blueprintjs-renderers": "^2.3.7",
3535
"react-docgen-typescript": "^2.2.2",
3636
"react-dom": "^18.2.0",
3737
"typedoc": "^0.23.18",

0 commit comments

Comments
 (0)