Merge pull request #60 from projectstorm/expand_node_hotfixes

bunch of hot fixes and improvements around expanding nodes + deps upgrade

Author: dylanvorster

.changeset/thin-jobs-bathe.md

@@ -0,0 +1,17 @@
+---
+'@projectstorm/react-workspaces-core': major
+'@projectstorm/react-workspaces-behavior-divider-dropzone': patch
+'@projectstorm/react-workspaces-behavior-panel-dropzone': patch
+'@projectstorm/react-workspaces-model-floating-window': patch
+'@projectstorm/react-workspaces-dropzone-plugin-tabs': patch
+'@projectstorm/react-workspaces-dropzone-plugin-tray': patch
+'@projectstorm/react-workspaces-behavior-resize': patch
+'@projectstorm/react-workspaces-model-tabs': patch
+'@projectstorm/react-workspaces-model-tray': patch
+'@projectstorm/react-workspaces-demo': patch
+'@projectstorm/react-workspaces-defaults': patch
+---
+
+- Fixed dragging panels sometimes causing a resize deadlock
+- Reworked the logic for computing initial sizes when there are muliple expanding panels in a group
+- Bumped all dependencies

.github/workflows/prettier.yml

@@ -9,15 +9,28 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          # Make sure the actual branch is checked out when running on pull requests
-          ref: ${{ github.head_ref }}
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+
+      - name: Read .nvmrc
+        run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
+        id: nvm
 
+      - name: Use Node.js (.nvmrc)
+        uses: actions/setup-node@v4
+        with:
+          node-version: "${{ steps.nvm.outputs.NVMRC }}"
 
-      - uses: actions/checkout@v2 # Check out the repository first.
-      - uses: actionsx/prettier@94c755de62c501c69236cda12f939d222142cd6d
+      - name: Install PNPM
+        uses: pnpm/action-setup@v4
         with:
-          # prettier CLI arguments.
-          args: --check --ignore-path .prettierignore --config .prettierrc '**/*.{ts,tsx,js,jsx}'
+          version: latest
+
+      - name: Install Dependencies
+        run: pnpm install
+
+      - name: Install Dependencies
+        run: pnpm install
+
+      - name: Check formatting
+        run: pnpm format --check

.github/workflows/release.yml

@@ -13,19 +13,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Read .nvmrc
         run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
         id: nvm
 
       - name: Use Node.js (.nvmrc)
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: "${{ steps.nvm.outputs.NVMRC }}"
 
       - name: Install PNPM
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v4
         with:
           version: latest
 

.github/workflows/test.yml

@@ -11,19 +11,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Read .nvmrc
         run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
         id: nvm
 
       - name: Use Node.js (.nvmrc)
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: "${{ steps.nvm.outputs.NVMRC }}"
 
       - name: Install PNPM
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v4
         with:
           version: latest
 

.nvmrc

@@ -1 +1 @@
-v16.15.0
+v20.16

.prettierrc

@@ -5,4 +5,4 @@
   "useTabs": false,
   "printWidth": 120,
   "trailingComma": "none"
-}
+}

demo/.storybook/main.js renamed to demo/.storybook/main.ts

@@ -1,4 +1,17 @@
-module.exports = {
+import type { StorybookConfig } from '@storybook/react-webpack5';
+
+const config: StorybookConfig = {
+  addons: [
+    {
+      name: '@storybook/addon-essentials'
+    },
+    {
+      name: '@storybook/addon-webpack5-compiler-babel'
+    }
+  ],
+  docs: {
+    autodocs: false
+  },
   stories: ['../dist/stories/*.stories.js'],
   webpackFinal: async (config, { configType }) => {
     return {
@@ -17,16 +30,10 @@ module.exports = {
       }
     };
   },
-  addons: [
-    {
-      name: '@storybook/addon-essentials'
-    }
-  ],
   framework: {
     name: '@storybook/react-webpack5',
     options: {}
-  },
-  docs: {
-    autodocs: false
   }
 };
+
+export default config;

demo/.babelrc.json renamed to demo/babel.config.json

@@ -7,7 +7,7 @@
     "storybook:build": "storybook build -o .out"
   },
   "dependencies": {
-    "@emotion/styled": "^11.11.0",
+    "@emotion/styled": "^11.13.0",
     "@projectstorm/react-workspaces-behavior-divider-dropzone": "workspace:*",
     "@projectstorm/react-workspaces-behavior-panel-dropzone": "workspace:*",
     "@projectstorm/react-workspaces-behavior-resize": "workspace:*",
@@ -19,25 +19,26 @@
     "@projectstorm/react-workspaces-model-tabs": "workspace:*",
     "@projectstorm/react-workspaces-model-tray": "workspace:*",
     "lodash": "^4.17.21",
-    "react": "^18.2.0",
+    "react": "^18.3.1",
     "typeface-open-sans": "^1.1.13"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.22.7",
-    "@babel/preset-react": "^7.22.5",
-    "@storybook/addon-essentials": "^7.0.26",
-    "@storybook/addons": "^7.0.26",
-    "@storybook/react": "^7.0.26",
-    "@storybook/react-webpack5": "^7.0.26",
+    "@babel/preset-env": "^7.25.4",
+    "@babel/preset-react": "^7.24.7",
+    "@storybook/addon-webpack5-compiler-babel": "^3.0.3",
+    "@storybook/addon-essentials": "^8.3.3",
+    "@storybook/addons": "^7.6.17",
+    "@storybook/react": "^8.3.3",
+    "@storybook/react-webpack5": "^8.3.3",
     "@storybook/storybook-deployer": "^2.8.16",
-    "@storybook/theming": "^7.0.26",
-    "@types/lodash": "^4.14.195",
-    "@types/node": "^20.4.1",
-    "@types/react": "18.2.14",
-    "@types/react-dom": "^18.2.6",
-    "react-dom": "18.2.0",
-    "source-map-loader": "^4.0.1",
-    "storybook": "^7.0.26",
-    "webpack": "^5.88.1"
+    "@storybook/theming": "^8.3.3",
+    "@types/lodash": "^4.17.9",
+    "@types/node": "^22.7.1",
+    "@types/react": "18.3.9",
+    "@types/react-dom": "^18.3.0",
+    "react-dom": "18.3.1",
+    "source-map-loader": "^5.0.0",
+    "storybook": "^8.3.3",
+    "webpack": "^5.95.0"
   }
 }

demo/package.json

@@ -14,7 +14,7 @@ export const createComplexModel = (engine: WorkspaceEngine) => {
       // when we overconstrained, we can use the directive below to cause the children layouts on the root model
       // to be recomputed (this method exists on all ExpandNodeModels )
       if (model.r_overConstrained) {
-        model.recomputeInitialSizes();
+        // model.recomputeInitialSizes();
       }
     }
   });