Skip to content

Commit 5867bd2

Browse files
committed
Update storybook configuration. Replace crystal toolkit scene slider component.
1 parent 71e3e39 commit 5867bd2

File tree

9 files changed

+31532
-41873
lines changed

9 files changed

+31532
-41873
lines changed

.storybook/main.js

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
11
module.exports = {
2-
stories: ['../src/stories/**/**/*.stories.@(ts|tsx|js|jsx|mdx)'],
2+
stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
33
addons: [
4+
'@storybook/addon-links',
45
'@storybook/addon-essentials',
5-
'@storybook/addon-actions'
6-
// '@storybook/addon-knobs/register',
7-
// '@storybook/addon-storysource'
6+
'@storybook/addon-interactions',
7+
'@storybook/addon-knobs'
88
],
9+
framework: '@storybook/react',
910
core: {
10-
builder: 'webpack5'
11+
builder: '@storybook/builder-webpack5'
1112
},
1213
webpackFinal: async (config) => {
13-
config.module.rules.push({
14-
test: /\.(ts|tsx)$/,
15-
use: [
16-
{
17-
loader: require.resolve('ts-loader')
18-
}
19-
]
20-
});
21-
config.resolve.extensions.push('.ts', '.tsx');
2214
config.module.rules.push({
2315
test: /\.less$/,
2416
use: ['style-loader', 'css-loader', 'less-loader']

package-lock.json

Lines changed: 31392 additions & 41440 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,18 @@
1818
"build-prod": "parcel build src/index.html",
1919
"build-publish": "rollup -c",
2020
"test": "jest --env=jsdom",
21-
"storybook": "start-storybook -p 6006",
22-
"build-storybook": "build-storybook",
23-
"deploy-storybook": "storybook-to-ghpages",
2421
"docz:dev": "docz dev",
2522
"docz:build": "docz build",
2623
"docz:serve": "docz build && docz serve",
2724
"lint:yaml": "yamllint ./.github/workflows/*.yml",
28-
"postversion": "git push && git push --tags"
25+
"postversion": "git push && git push --tags",
26+
"storybook": "start-storybook -p 6006",
27+
"build-storybook": "build-storybook",
28+
"deploy-storybook": "storybook-to-ghpages"
2929
},
3030
"dependencies": {
3131
"@babel/preset-typescript": "^7.17.12",
3232
"@babel/runtime": "^7.17.9",
33-
"@storybook/addon-actions": "^6.3.12",
3433
"@types/classnames": "^2.2.11",
3534
"axios": "^0.21.1",
3635
"base64-js": "^1.5.1",
@@ -48,7 +47,6 @@
4847
"react": "^16.14.0",
4948
"react-aria-menubutton": "^7.0.1",
5049
"react-collapsible": "^2.8.3",
51-
"react-compound-slider": "^3.3.1",
5250
"react-data-table-component": "^6.11.6",
5351
"react-dom": "^16.14.0",
5452
"react-graph-vis": "^1.0.5",
@@ -84,9 +82,16 @@
8482
"@parcel/transformer-less": "^2.5.0",
8583
"@parcel/transformer-sass": "^2.5.0",
8684
"@rollup/plugin-image": "^2.0.6",
87-
"@storybook/addon-knobs": "6.2.9",
88-
"@storybook/react": "6.3.8",
89-
"@storybook/storybook-deployer": "^2.8.7",
85+
"@storybook/addon-actions": "^6.5.3",
86+
"@storybook/addon-essentials": "^6.5.3",
87+
"@storybook/addon-interactions": "^6.5.3",
88+
"@storybook/addon-knobs": "^6.4.0",
89+
"@storybook/addon-links": "^6.5.3",
90+
"@storybook/builder-webpack5": "^6.5.3",
91+
"@storybook/manager-webpack5": "^6.5.3",
92+
"@storybook/react": "^6.5.3",
93+
"@storybook/storybook-deployer": "^2.8.11",
94+
"@storybook/testing-library": "^0.0.11",
9095
"@testing-library/jest-dom": "^5.11.6",
9196
"@testing-library/react": "^11.2.2",
9297
"@testing-library/user-event": "^13.5.0",
@@ -96,11 +101,12 @@
96101
"@types/react-dom": "^17.0.9",
97102
"@types/react-responsive": "^8.0.2",
98103
"css-loader": "^6.7.1",
104+
"babel-loader": "^8.2.5",
99105
"enzyme": "^3.11.0",
100106
"enzyme-adapter-react-16": "^1.15.5",
101107
"husky": "^4.3.6",
102108
"ignore-loader": "^0.1.2",
103-
"jest": "^25.5.4",
109+
"jest": "^26.6.3",
104110
"jsdom": "^16.4.0",
105111
"less": "^3.13.1",
106112
"less-loader": "^10.2.0",
@@ -116,21 +122,19 @@
116122
"rollup-plugin-typescript2": "^0.30.0",
117123
"source-map-explorer": "^2.5.2",
118124
"style-loader": "^1.3.0",
119-
"ts-jest": "^25.2.0",
125+
"ts-jest": "^26.5.6",
120126
"ts-loader": "^9.2.3",
121-
"typescript": "^3.9.10",
122-
"webpack": "^5.41.1",
127+
"typescript": "^4.4.4",
128+
"webpack": "^5.72.1",
123129
"yaml-lint": "^1.2.4"
124130
},
125131
"overrides": {
126132
"graphql": "14.7.0",
127-
"@mdx-js/mdx": "^1.5.9",
128133
"nconf": ">=0.11.4",
129134
"async": ">=3.2.3",
130135
"node-forge": ">=1.3.0",
131136
"nanoid": ">=3.1.31",
132137
"ansi-html": ">=0.0.8",
133-
"postcss": "^7.0.36",
134138
"glob-parent": ">=5.1.2",
135139
"prismjs": ">=1.27.0",
136140
"nth-check": ">=2.0.1",

src/components/crystal-toolkit/CrystalToolkitScene/CrystalToolkitScene.tsx

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import {
2626
CameraState,
2727
initialState
2828
} from '../CameraContextProvider/camera-reducer';
29-
import SimpleSlider from '../scene/animation-slider';
3029
import { usePrevious } from '../../../utils/hooks';
3130
import toDataUrl from 'svgtodatauri';
3231
import * as THREE from 'three';
@@ -45,6 +44,7 @@ import ReactTooltip from 'react-tooltip';
4544
import { v4 as uuidv4 } from 'uuid';
4645
import { ModalCloseButton } from '../../data-display/Modal/ModalCloseButton';
4746
import { downloadBlob, downloadJSON } from '../../data-entry/utils';
47+
import { RangeSlider } from '../../data-entry/RangeSlider';
4848

4949
const getSceneSize = (sceneSize) => (sceneSize ? sceneSize : DEFAULT_SCENE_SIZE);
5050

@@ -640,11 +640,15 @@ export const CrystalToolkitScene: React.FC<CrystalToolkitSceneProps> = ({
640640
)}
641641

642642
{props.animation === AnimationStyle.SLIDER && (
643-
<SimpleSlider
644-
onUpdate={(a) => {
645-
scene.current!.updateTime(a / 100);
646-
}}
643+
<RangeSlider
644+
domain={[0, 100]}
645+
onChange={(values) => scene.current!.updateTime(values[0] / 100)}
647646
/>
647+
// <SimpleSlider
648+
// onUpdate={(a) => {
649+
// scene.current!.updateTime(a / 100);
650+
// }}
651+
// />
648652
)}
649653
</div>
650654
</div>

0 commit comments

Comments
 (0)