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

Author: lukasbach

.github/workflows/prerelease.yml

@@ -27,3 +27,16 @@ jobs:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
       - name: Release info
         run: cat ./lerna-publish-summary.json
+      - name: Update lockfile
+        run: |
+          echo "enableImmutableInstalls: false" > ./.yarnrc.yml
+          yarn
+          git checkout HEAD -- ./.yarnrc.yml
+        env:
+          CI: false
+      - name: Push remaining changes
+        uses: EndBug/add-and-commit@v9
+        with:
+          author_name: lukasbachbot
+          author_email: bot@noreply.lukasbach.com
+          message: 'chore: tidy up after prerelease'

lerna-publish-summary.json

@@ -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"}]
+[{"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

@@ -2,5 +2,5 @@
   "packages": ["packages/*"],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "2.3.7-alpha.1"
+  "version": "2.3.7"
 }

packages/autodemo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-complex-tree-autodemo",
-  "version": "2.3.7-alpha.1",
+  "version": "2.3.7",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "repository": {
@@ -23,10 +23,10 @@
     "@types/react-dom": "^18.0.7",
     "babel-jest": "^27.5.1",
     "babel-loader": "^9.1.0",
-    "demodata": "^2.3.7-alpha.1",
+    "demodata": "^2.3.7",
     "jest": "^26.6.3",
     "react": "^18.2.0",
-    "react-complex-tree": "^2.3.7-alpha.1",
+    "react-complex-tree": "^2.3.7",
     "react-dom": "^18.2.0",
     "react-test-renderer": "^18.2.0",
     "ts-node": "^10.7.0",

packages/blueprintjs-renderers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-complex-tree-blueprintjs-renderers",
-  "version": "2.3.7-alpha.1",
+  "version": "2.3.7",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "repository": {
@@ -26,10 +26,10 @@
     "@types/react-dom": "^18.0.7",
     "babel-jest": "^27.5.1",
     "babel-loader": "^9.1.0",
-    "demodata": "^2.3.7-alpha.1",
+    "demodata": "^2.3.7",
     "jest": "^26.6.3",
     "react": "^18.2.0",
-    "react-complex-tree": "^2.3.7-alpha.1",
+    "react-complex-tree": "^2.3.7",
     "react-dom": "^18.2.0",
     "react-test-renderer": "^18.2.0",
     "ts-node": "^10.7.0",

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-complex-tree",
-  "version": "2.3.7-alpha.1",
+  "version": "2.3.7",
   "main": "lib/cjs/index.js",
   "module": "lib/esm/index.js",
   "esnext": "lib/esnext/index.js",
@@ -35,7 +35,7 @@
     "babel-jest": "^27.5.1",
     "babel-loader": "^9.1.0",
     "cpy-cli": "^3.1.1",
-    "demodata": "^2.3.7-alpha.1",
+    "demodata": "^2.3.7",
     "jest": "^29.2.2",
     "jest-dom": "^4.0.0",
     "jest-environment-jsdom": "^29.2.2",

packages/demodata/package.json

@@ -1,6 +1,6 @@
 {
   "name": "demodata",
-  "version": "2.3.7-alpha.1",
+  "version": "2.3.7",
   "main": "lib/index.js",
   "repository": {
     "type": "git",

packages/docs/docs/changelog.mdx

@@ -4,27 +4,13 @@ sidebar_position: 6
 
 # Changelog
 
-## 2.3.7-alpha.0 - 10/03/2024
+## 2.3.7 - 15/03/2024
 
-### Features
-
-- Make drop target depth in last-of-subtree locations dependent on x-coordinates of the mouse, allowing the user to
-  drop in higher depths than the currently hovering item. This behavior is automatically used if `renderDepthOffset`
-  on the renderers is set to a non-zero value. (#148)
-  - This also applies when dropping at the top of an item where the item prior is of deeper depth, meaning that
-    in this case the decision of dropping into the container above or directly above the hovering item will depend
-    on the x-coordinate of the mouse.
-- Add `setDomFocus` argument to focus-item methods to provide an escape hatch to set the focus state of an item in RCT
-  without updating the DOM focus. This defaults to true in all existing methods to maintain the current behavior if
-  it is absent. (#336)
-- Allow customizing when a subtree is rendered or not with the new `shouldRenderChildren` prop. This can be used to 
-  create opening and closing animations on subtrees. See [Demo](https://rct.lukasbach.com/storybook/?path=/story/core-basic-examples--animated-expanding-and-collapsing)
-  and [Demo Implementation](https://github.com/lukasbach/react-complex-tree/blob/main/packages/core/src/stories/BasicExamples.stories.tsx#L561) for details. (#333)
-
-### Bug Fixes
+# Featureset revertion to the state of 2.3.6
 
-- Fix a bug where the `parentId` property in the `renderItemsContainer` render method was incorrectly set to the tree id
-  for the root container.
+I've noticed that I've accidentally been pushing a few experimental releases that were meant to be released
+as prerelease under the "Latest" tag in NPM. This reverts the latest release to the state of 2.3.6, the last
+proper "latest" release. Prereleases will from now on be released under the "prerelease" tag in NPM.
 
 
 

packages/docs/docs/guides/rendering.mdx

@@ -119,7 +119,7 @@ renderItem={({ title, arrow, depth, context, children }) => (
       </button>
     </li>
     {children}
-  <>
+  </>
 )}
 ```
 

packages/docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docs",
-  "version": "2.3.7-alpha.1",
+  "version": "2.3.7",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",
@@ -21,17 +21,17 @@
     "@mdx-js/react": "^1.6.21",
     "@svgr/webpack": "^6.5.1",
     "clsx": "^1.1.1",
-    "demodata": "^2.3.7-alpha.1",
+    "demodata": "^2.3.7",
     "docusaurus-plugin-react-docgen-typescript": "^1.0.2",
     "docusaurus-plugin-typedoc": "^0.18.0",
     "file-loader": "^6.2.0",
     "iframe-resizer": "^4.3.2",
     "iframe-resizer-react": "^1.1.0",
     "prism-react-renderer": "^1.2.1",
     "react": "^18.2.0",
-    "react-complex-tree": "^2.3.7-alpha.1",
-    "react-complex-tree-autodemo": "^2.3.7-alpha.1",
-    "react-complex-tree-blueprintjs-renderers": "^2.3.7-alpha.1",
+    "react-complex-tree": "^2.3.7",
+    "react-complex-tree-autodemo": "^2.3.7",
+    "react-complex-tree-blueprintjs-renderers": "^2.3.7",
     "react-docgen-typescript": "^2.2.2",
     "react-dom": "^18.2.0",
     "typedoc": "^0.23.18",

yarn.lock

@@ -11803,7 +11803,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"demodata@^2.3.7-alpha.0, demodata@workspace:packages/demodata":
+"demodata@^2.3.7, demodata@workspace:packages/demodata":
   version: 0.0.0-use.local
   resolution: "demodata@workspace:packages/demodata"
   dependencies:
@@ -12029,17 +12029,17 @@ __metadata:
     "@mdx-js/react": ^1.6.21
     "@svgr/webpack": ^6.5.1
     clsx: ^1.1.1
-    demodata: ^2.3.7-alpha.0
+    demodata: ^2.3.7
     docusaurus-plugin-react-docgen-typescript: ^1.0.2
     docusaurus-plugin-typedoc: ^0.18.0
     file-loader: ^6.2.0
     iframe-resizer: ^4.3.2
     iframe-resizer-react: ^1.1.0
     prism-react-renderer: ^1.2.1
     react: ^18.2.0
-    react-complex-tree: ^2.3.7-alpha.0
-    react-complex-tree-autodemo: ^2.3.7-alpha.0
-    react-complex-tree-blueprintjs-renderers: ^2.3.7-alpha.0
+    react-complex-tree: ^2.3.7
+    react-complex-tree-autodemo: ^2.3.7
+    react-complex-tree-blueprintjs-renderers: ^2.3.7
     react-docgen-typescript: ^2.2.2
     react-dom: ^18.2.0
     typedoc: ^0.23.18
@@ -21548,7 +21548,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-complex-tree-autodemo@^2.3.7-alpha.0, react-complex-tree-autodemo@workspace:packages/autodemo":
+"react-complex-tree-autodemo@^2.3.7, react-complex-tree-autodemo@workspace:packages/autodemo":
   version: 0.0.0-use.local
   resolution: "react-complex-tree-autodemo@workspace:packages/autodemo"
   dependencies:
@@ -21562,18 +21562,18 @@ __metadata:
     "@types/react-dom": ^18.0.7
     babel-jest: ^27.5.1
     babel-loader: ^9.1.0
-    demodata: ^2.3.7-alpha.0
+    demodata: ^2.3.7
     jest: ^26.6.3
     react: ^18.2.0
-    react-complex-tree: ^2.3.7-alpha.0
+    react-complex-tree: ^2.3.7
     react-dom: ^18.2.0
     react-test-renderer: ^18.2.0
     ts-node: ^10.7.0
     typescript: 4.9.3
   languageName: unknown
   linkType: soft
 
-"react-complex-tree-blueprintjs-renderers@^2.3.7-alpha.0, react-complex-tree-blueprintjs-renderers@workspace:packages/blueprintjs-renderers":
+"react-complex-tree-blueprintjs-renderers@^2.3.7, react-complex-tree-blueprintjs-renderers@workspace:packages/blueprintjs-renderers":
   version: 0.0.0-use.local
   resolution: "react-complex-tree-blueprintjs-renderers@workspace:packages/blueprintjs-renderers"
   dependencies:
@@ -21589,10 +21589,10 @@ __metadata:
     "@types/react-dom": ^18.0.7
     babel-jest: ^27.5.1
     babel-loader: ^9.1.0
-    demodata: ^2.3.7-alpha.0
+    demodata: ^2.3.7
     jest: ^26.6.3
     react: ^18.2.0
-    react-complex-tree: ^2.3.7-alpha.0
+    react-complex-tree: ^2.3.7
     react-dom: ^18.2.0
     react-test-renderer: ^18.2.0
     ts-node: ^10.7.0
@@ -21640,7 +21640,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"react-complex-tree@^2.3.7-alpha.0, react-complex-tree@workspace:packages/core":
+"react-complex-tree@^2.3.7, react-complex-tree@workspace:packages/core":
   version: 0.0.0-use.local
   resolution: "react-complex-tree@workspace:packages/core"
   dependencies:
@@ -21658,7 +21658,7 @@ __metadata:
     babel-jest: ^27.5.1
     babel-loader: ^9.1.0
     cpy-cli: ^3.1.1
-    demodata: ^2.3.7-alpha.0
+    demodata: ^2.3.7
     jest: ^29.2.2
     jest-dom: ^4.0.0
     jest-environment-jsdom: ^29.2.2