Skip to content

Commit 27afdf7

Browse files
authored
Merge pull request #60 from projectstorm/expand_node_hotfixes
bunch of hot fixes and improvements around expanding nodes + deps upgrade
2 parents 72490a5 + 51fb0f8 commit 27afdf7

File tree

28 files changed

+6099
-8199
lines changed

28 files changed

+6099
-8199
lines changed

.changeset/thin-jobs-bathe.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
'@projectstorm/react-workspaces-core': major
3+
'@projectstorm/react-workspaces-behavior-divider-dropzone': patch
4+
'@projectstorm/react-workspaces-behavior-panel-dropzone': patch
5+
'@projectstorm/react-workspaces-model-floating-window': patch
6+
'@projectstorm/react-workspaces-dropzone-plugin-tabs': patch
7+
'@projectstorm/react-workspaces-dropzone-plugin-tray': patch
8+
'@projectstorm/react-workspaces-behavior-resize': patch
9+
'@projectstorm/react-workspaces-model-tabs': patch
10+
'@projectstorm/react-workspaces-model-tray': patch
11+
'@projectstorm/react-workspaces-demo': patch
12+
'@projectstorm/react-workspaces-defaults': patch
13+
---
14+
15+
- Fixed dragging panels sometimes causing a resize deadlock
16+
- Reworked the logic for computing initial sizes when there are muliple expanding panels in a group
17+
- Bumped all dependencies

.github/workflows/prettier.yml

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,28 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- name: Checkout
13-
uses: actions/checkout@v2
14-
with:
15-
# Make sure the actual branch is checked out when running on pull requests
16-
ref: ${{ github.head_ref }}
12+
- name: Checkout Repo
13+
uses: actions/checkout@v4
14+
15+
- name: Read .nvmrc
16+
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
17+
id: nvm
1718

19+
- name: Use Node.js (.nvmrc)
20+
uses: actions/setup-node@v4
21+
with:
22+
node-version: "${{ steps.nvm.outputs.NVMRC }}"
1823

19-
- uses: actions/checkout@v2 # Check out the repository first.
20-
- uses: actionsx/prettier@94c755de62c501c69236cda12f939d222142cd6d
24+
- name: Install PNPM
25+
uses: pnpm/action-setup@v4
2126
with:
22-
# prettier CLI arguments.
23-
args: --check --ignore-path .prettierignore --config .prettierrc '**/*.{ts,tsx,js,jsx}'
27+
version: latest
28+
29+
- name: Install Dependencies
30+
run: pnpm install
31+
32+
- name: Install Dependencies
33+
run: pnpm install
34+
35+
- name: Check formatting
36+
run: pnpm format --check

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout Repo
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v4
1717

1818
- name: Read .nvmrc
1919
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
2020
id: nvm
2121

2222
- name: Use Node.js (.nvmrc)
23-
uses: actions/setup-node@v2
23+
uses: actions/setup-node@v4
2424
with:
2525
node-version: "${{ steps.nvm.outputs.NVMRC }}"
2626

2727
- name: Install PNPM
28-
uses: pnpm/action-setup@v2
28+
uses: pnpm/action-setup@v4
2929
with:
3030
version: latest
3131

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout Repo
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@v4
1515

1616
- name: Read .nvmrc
1717
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
1818
id: nvm
1919

2020
- name: Use Node.js (.nvmrc)
21-
uses: actions/setup-node@v2
21+
uses: actions/setup-node@v4
2222
with:
2323
node-version: "${{ steps.nvm.outputs.NVMRC }}"
2424

2525
- name: Install PNPM
26-
uses: pnpm/action-setup@v2
26+
uses: pnpm/action-setup@v4
2727
with:
2828
version: latest
2929

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v16.15.0
1+
v20.16

.prettierrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
"useTabs": false,
66
"printWidth": 120,
77
"trailingComma": "none"
8-
}
8+
}

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

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
1-
module.exports = {
1+
import type { StorybookConfig } from '@storybook/react-webpack5';
2+
3+
const config: StorybookConfig = {
4+
addons: [
5+
{
6+
name: '@storybook/addon-essentials'
7+
},
8+
{
9+
name: '@storybook/addon-webpack5-compiler-babel'
10+
}
11+
],
12+
docs: {
13+
autodocs: false
14+
},
215
stories: ['../dist/stories/*.stories.js'],
316
webpackFinal: async (config, { configType }) => {
417
return {
@@ -17,16 +30,10 @@ module.exports = {
1730
}
1831
};
1932
},
20-
addons: [
21-
{
22-
name: '@storybook/addon-essentials'
23-
}
24-
],
2533
framework: {
2634
name: '@storybook/react-webpack5',
2735
options: {}
28-
},
29-
docs: {
30-
autodocs: false
3136
}
3237
};
38+
39+
export default config;
File renamed without changes.

demo/package.json

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"storybook:build": "storybook build -o .out"
88
},
99
"dependencies": {
10-
"@emotion/styled": "^11.11.0",
10+
"@emotion/styled": "^11.13.0",
1111
"@projectstorm/react-workspaces-behavior-divider-dropzone": "workspace:*",
1212
"@projectstorm/react-workspaces-behavior-panel-dropzone": "workspace:*",
1313
"@projectstorm/react-workspaces-behavior-resize": "workspace:*",
@@ -19,25 +19,26 @@
1919
"@projectstorm/react-workspaces-model-tabs": "workspace:*",
2020
"@projectstorm/react-workspaces-model-tray": "workspace:*",
2121
"lodash": "^4.17.21",
22-
"react": "^18.2.0",
22+
"react": "^18.3.1",
2323
"typeface-open-sans": "^1.1.13"
2424
},
2525
"devDependencies": {
26-
"@babel/preset-env": "^7.22.7",
27-
"@babel/preset-react": "^7.22.5",
28-
"@storybook/addon-essentials": "^7.0.26",
29-
"@storybook/addons": "^7.0.26",
30-
"@storybook/react": "^7.0.26",
31-
"@storybook/react-webpack5": "^7.0.26",
26+
"@babel/preset-env": "^7.25.4",
27+
"@babel/preset-react": "^7.24.7",
28+
"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
29+
"@storybook/addon-essentials": "^8.3.3",
30+
"@storybook/addons": "^7.6.17",
31+
"@storybook/react": "^8.3.3",
32+
"@storybook/react-webpack5": "^8.3.3",
3233
"@storybook/storybook-deployer": "^2.8.16",
33-
"@storybook/theming": "^7.0.26",
34-
"@types/lodash": "^4.14.195",
35-
"@types/node": "^20.4.1",
36-
"@types/react": "18.2.14",
37-
"@types/react-dom": "^18.2.6",
38-
"react-dom": "18.2.0",
39-
"source-map-loader": "^4.0.1",
40-
"storybook": "^7.0.26",
41-
"webpack": "^5.88.1"
34+
"@storybook/theming": "^8.3.3",
35+
"@types/lodash": "^4.17.9",
36+
"@types/node": "^22.7.1",
37+
"@types/react": "18.3.9",
38+
"@types/react-dom": "^18.3.0",
39+
"react-dom": "18.3.1",
40+
"source-map-loader": "^5.0.0",
41+
"storybook": "^8.3.3",
42+
"webpack": "^5.95.0"
4243
}
4344
}

demo/stories/helpers/complexModel.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export const createComplexModel = (engine: WorkspaceEngine) => {
1414
// when we overconstrained, we can use the directive below to cause the children layouts on the root model
1515
// to be recomputed (this method exists on all ExpandNodeModels )
1616
if (model.r_overConstrained) {
17-
model.recomputeInitialSizes();
17+
// model.recomputeInitialSizes();
1818
}
1919
}
2020
});

0 commit comments

Comments
 (0)