Merge branch 'main' into patch-1

Author: lukasbach

.github/workflows/release.yml

@@ -0,0 +1,79 @@
+name: Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      bump:
+        required: true
+        type: choice
+        options:
+          - major
+          - minor
+          - patch
+          - premajor
+          - preminor
+          - prepatch
+          - prerelease
+          - from-git
+          - from-package
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: volta-cli/action@v3
+      - name: Dependencies
+        run: yarn
+      - name: Lint
+        run: yarn lint
+      - name: Build
+        run: yarn build
+      - name: Test
+        run: yarn test
+      - name: Do Release
+        run: |
+          yarn lerna publish ${{ github.event.inputs.bump }} --yes --summary-file
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - name: Release info
+        run: cat ./lerna-publish-summary.json
+      - name: Read new version
+        run: |
+          pkg=$(cat ./packages/core/package.json)
+          ver=$(jq -r '.version' <<< $pkg)
+          echo "version=$ver" >> $GITHUB_ENV
+          echo "New Version is $ver"
+      - name: Check Changelog
+        run: |
+          if ! test -f "./next-release-notes.md"; then
+              exit 1
+          fi
+          echo "Changelog:"
+          cat ./next-release-notes.md
+      - name: Update Changelog
+        run: |
+          now="$(date +'%d/%m/%Y')"
+          # sorry
+          echo -e "$(sed -n '1,6p' ./packages/docs/docs/changelog.mdx)\n\n## ${{env.version}} - $now\n\n$(cat ./next-release-notes.md)\n\n\n$(sed -n '6,99999p' ./packages/docs/docs/changelog.mdx)" > ./packages/docs/docs/changelog.mdx
+      - name: Github Release
+        uses: softprops/action-gh-release@v1
+        with:
+          body_path: next-release-notes.md
+          name: ${{env.version}}
+          tag_name: ${{env.version}}
+          files: |
+            lerna-publish-summary.json
+            next-release-notes.md
+            LICENSE
+      - name: Prepare next Changelog
+        run: |
+          rm ./next-release-notes.md
+          cp ./next-release-notes-template.md ./next-release-notes.md
+      - name: Push next Changelog
+        uses: EndBug/add-and-commit@v9
+        with:
+          add: './next-release-notes.md'
+          author_name: lukasbachbot
+          author_email: [email protected]
+          message: 'chore: reset next release notes [skip-ci]'

next-release-notes-template.md

@@ -0,0 +1,9 @@
+<!--
+### Breaking Changes
+
+### Features
+
+### Bug Fixes and Improvements
+
+### Other Changes
+-->

next-release-notes.md

@@ -0,0 +1,9 @@
+### Bug Fixes and Improvements
+* Fixed a bug where autofocus for the search input was not working for blueprintjs
+  renderers (#197)
+* Fixed a bug where tree labels where not set (#195)
+* Reduce react peer dependency requirement to v16 (#196)
+
+### Other Changes
+* Upgraded storybook and yarn dependencies in dev tooling
+* Added release pipeline in CI

package.json

@@ -20,16 +20,16 @@
     "lint:fix": "eslint --ext .ts,.tsx packages/ --fix"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "^6.5.13",
-    "@storybook/addon-actions": "^6.5.13",
-    "@storybook/addon-docs": "^6.5.13",
-    "@storybook/addon-essentials": "^6.5.13",
-    "@storybook/addon-links": "^6.5.13",
-    "@storybook/addons": "^6.5.13",
-    "@storybook/builder-webpack5": "^6.5.13",
-    "@storybook/manager-webpack5": "^6.5.13",
+    "@storybook/addon-a11y": "^6.5.14",
+    "@storybook/addon-actions": "^6.5.14",
+    "@storybook/addon-docs": "^6.5.14",
+    "@storybook/addon-essentials": "^6.5.14",
+    "@storybook/addon-links": "^6.5.14",
+    "@storybook/addons": "^6.5.14",
+    "@storybook/builder-webpack5": "^6.5.14",
+    "@storybook/manager-webpack5": "^6.5.14",
     "@storybook/preset-typescript": "^3.0.0",
-    "@storybook/react": "^6.5.13",
+    "@storybook/react": "^6.5.14",
     "@types/storybook__react": "^5.2.1",
     "@typescript-eslint/eslint-plugin": "^5.41.0",
     "@typescript-eslint/parser": "^5.41.0",
@@ -42,7 +42,7 @@
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.31.10",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-storybook": "^0.6.6",
+    "eslint-plugin-storybook": "^0.6.8",
     "lerna": "^6.1.0",
     "prettier": "^2.7.1",
     "react": "^18.2.0",

packages/core/src/search/SearchInput.tsx

@@ -77,7 +77,7 @@ export const SearchInput: React.FC<{
         clearSearch();
       },
       ref: el => {
-        el?.focus();
+        el?.focus?.();
       },
       'aria-label': 'Search for items', // TODO
       ...({

packages/core/src/tree/useCreatedTreeInformation.ts

@@ -21,11 +21,15 @@ export const useCreatedTreeInformation = (
       isProgrammaticallyDragging: dnd.isProgrammaticallyDragging ?? false,
       treeId: tree.treeId,
       rootItem: tree.rootItem,
+      treeLabel: tree.treeLabel,
+      treeLabelledBy: tree.treeLabelledBy,
     }),
     [
       environment.activeTreeId,
       tree.treeId,
       tree.rootItem,
+      tree.treeLabel,
+      tree.treeLabelledBy,
       renamingItem,
       selectedItems?.length,
       search,

packages/core/src/treeItem/TreeItemRenamingInput.tsx

@@ -46,7 +46,7 @@ export const TreeItemRenamingInput: React.FC<{
 
       if (environment.autoFocus ?? true) {
         inputRef.current?.select();
-        inputRef.current?.focus();
+        inputRef.current?.focus?.();
       }
     },
     [environment, treeId],