Skip to content

Commit b9c7005

Browse files
Working Vite Version
1 parent 0cddae5 commit b9c7005

File tree

13 files changed

+2239
-1843
lines changed

13 files changed

+2239
-1843
lines changed

package-lock.json

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

package.json

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
11
{
22
"name": "jsonforms-react-spectrum-vite-test",
33
"private": false,
4-
"version": "0.0.2",
4+
"version": "0.0.21",
55
"type": "module",
6+
"files": [
7+
"dist"
8+
],
9+
"main": "./dist/index.umd.js",
10+
"module": "./dist/index.es.js",
11+
"types": "./dist/index.d.ts",
12+
"exports": {
13+
".": {
14+
"import": "./dist/index.es.js",
15+
"require": "./dist/index.umd.js"
16+
}
17+
},
18+
"sideEffects": [
19+
"*.css"
20+
],
621
"scripts": {
722
"dev": "vite",
823
"build": "tsc && vite build",
@@ -26,13 +41,13 @@
2641
"customization"
2742
],
2843
"dependencies": {
29-
"@adobe/react-spectrum": "^3.19.0",
44+
"@adobe/react-spectrum": "^3.20.0",
3045
"@date-io/moment": "2.14.0",
31-
"@internationalized/date": "^3.0.0",
46+
"@internationalized/date": "^3.0.1",
3247
"@jsonforms/core": "^3.0.0-rc.0",
3348
"@jsonforms/examples": "^3.0.0-rc.0",
3449
"@jsonforms/react": "^3.0.0-rc.0",
35-
"@spectrum-icons/workflow": "^4.0.0",
50+
"@spectrum-icons/workflow": "^4.0.1",
3651
"@types/lodash": "^4.14.182",
3752
"@types/react": "^18.0.15",
3853
"@types/react-dom": "^18.0.6",
@@ -49,7 +64,16 @@
4964
"react-spring": "^9.5.2",
5065
"redux": "^4.2.0",
5166
"tslib": "^2.4.0",
52-
"uuid": "^8.3.2"
67+
"uuid": "^8.3.2",
68+
"vite-plugin-css-injected-by-js": "^2.0.2"
69+
},
70+
"peerDependencies": {
71+
"@adobe/react-spectrum": "^3.20.0",
72+
"@jsonforms/core": "3.0.0-beta.5",
73+
"@jsonforms/react": "3.0.0-beta.5",
74+
"@spectrum-icons/workflow": "^4.0.0",
75+
"react": "^18.2.0",
76+
"react-dom": "^18.2.0"
5377
},
5478
"devDependencies": {
5579
"@codemirror/lang-javascript": "^6.0.2",
@@ -64,6 +88,7 @@
6488
"enzyme": "^3.11.0",
6589
"rimraf": "^3.0.2",
6690
"typescript": "^4.7.4",
67-
"vite": "^3.0.3"
91+
"vite": "^3.0.4",
92+
"vite-plugin-dts": "^1.4.1"
6893
}
6994
}

src/example/theme.switcher.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ function ThemeSelection({ onChange }: { onChange: (newTheme: Theme) => void }) {
4747
<SpectrumThemeProvider colorScheme={theme} theme={defaultTheme}>
4848
<View position='absolute' bottom='size-200' left='size-200'>
4949
<Picker
50+
aria-label='Theme selection'
5051
direction='top'
5152
label='Theme'
5253
defaultSelectedKey={theme}

src/playground/src/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ function App(props: AppProps & { selectedExample: ReactExampleDescription }) {
149149
<Heading>Example Forms</Heading>
150150
<ExamplesPicker {...props} onChange={setExampleByName} />
151151

152-
<Tabs defaultSelectedKey='boundData'>
152+
<Tabs aria-label='Example Tab' defaultSelectedKey='boundData'>
153153
<TabList>
154154
<Item key='boundData'>Bound data</Item>
155155
<Item key='schema'>Schema</Item>

src/playground/src/ExamplesPicker.tsx

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,17 @@ export function ExamplesPicker(props: {
7777
onSelectionChange={props.onChange}
7878
>
7979
{(item) => (
80-
<Section key={item?.name} items={item?.children} title={item?.name}>
81-
{(item) => <Item>{item?.label}</Item>}
80+
<Section
81+
aria-label={`Example Section ${item?.name}`}
82+
key={item?.name}
83+
items={item?.children}
84+
title={item?.name}
85+
>
86+
{(item) => (
87+
<Item aria-label={`Example Picker ${item?.label}`}>
88+
{item?.label}
89+
</Item>
90+
)}
8291
</Section>
8392
)}
8493
</Picker>

src/playground/src/TextArea.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import * as React from 'react';
2929
// import { UnControlled as CodeMirror } from 'react-codemirror2';
3030
import CodeMirror from '@uiw/react-codemirror';
3131
import { javascript } from '@codemirror/lang-javascript';
32-
import { ColorSchemeContext } from '../../src/util/ColorSchemeContext';
32+
// import { ColorSchemeContext } from '../../src/util/ColorSchemeContext';
3333
import { ButtonGroup, Button, StatusLight, View } from '@adobe/react-spectrum';
3434

3535
// import 'codemirror/mode/javascript/javascript';
@@ -38,7 +38,7 @@ export function TextArea(props: {
3838
value: string;
3939
onChange: (newValue: string) => void;
4040
}) {
41-
const colorScheme = React.useContext(ColorSchemeContext);
41+
// const colorScheme = React.useContext(ColorSchemeContext);
4242
const [value, setValue] = React.useState(props.value);
4343
const err = getErr(value);
4444
const [key, setKey] = React.useState(Math.random()); // used to force-rerender CodeMirror when Reset button is clicked

src/src/complex/ArrayModal/SpectrumArrayModalControl/DragAndDrop.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ export default function DragAndDrop({
140140
{springs.map(({ zIndex, shadow, y, scale }, index: number) => (
141141
<animated.div
142142
{...bind(index)}
143-
key={index}
143+
key={`${index}`}
144144
style={{
145145
zIndex,
146146
boxShadow: shadow.to(

src/src/complex/ArrayModal/SpectrumArrayModalItem/SpectrumArrayModalItem.css

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,16 @@ button {
3939
.list-array-item.enableDetailedView {
4040
background-color: var(--spectrum-global-color-gray-100);
4141
}
42+
.list-array-item.enableDetailedView.collapsed {
43+
}
4244
.list-array-item.enableDetailedView.expanded {
4345
background-color: var(--spectrum-global-color-gray-100);
44-
position: fixed !important;
4546
top: 0;
46-
right: 0;
47+
left: 0;
4748
z-index: 9000;
48-
width: 95%;
49-
min-height: 100vh;
49+
width: 100%;
50+
min-height: 100%;
51+
height: 100%;
5052
flex-grow: 1;
5153
contain: paint;
5254
}
@@ -56,24 +58,20 @@ button {
5658
}
5759
.animatedModalItemDiv > .refDivForPosition {
5860
height: 100%;
59-
max-width: 100%;
6061
}
6162

6263
.list-array-item.enableDetailedView.expanded > .array-item-header {
63-
width: 100%;
64-
padding: 15px 0;
64+
position: sticky;
65+
width: calc(100% + 24px);
66+
margin-left: -12px;
67+
68+
padding: 10px 0 10px 0;
6569
margin-top: -12px;
66-
margin-bottom: 10px;
6770
border-radius: 10px 10px 0 0;
68-
position: absolute;
69-
top: 0;
71+
top: 0px;
7072
left: 0;
7173

7274
background-color: var(--spectrum-global-color-gray-100);
7375
z-index: 1;
7476
border-bottom: 2px solid var(--spectrum-global-color-gray-200);
7577
}
76-
77-
.json-dispatch-wrapper {
78-
padding-top: 40px;
79-
}

src/src/complex/SpectrumCategorizationRenderer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export const SpectrumCategorizationRenderer = (
8585
return (
8686
<View isHidden={!visible}>
8787
<SpectrumProvider>
88-
<Tabs isDisabled={enabled === undefined ? false : !enabled}>
88+
<Tabs /* isDisabled={enabled === undefined ? false : !enabled} */>
8989
<TabList>
9090
{categories?.map((category: { [key: string]: any }, index) => (
9191
<Item key={index}>

src/src/complex/SpectrumCategorizationStepperRenderer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ export const SpectrumCategorizationStepperRenderer = (
9191
UNSAFE_className='categorization-stepper'
9292
>
9393
<Tabs
94-
isDisabled={enabled === undefined ? false : !enabled}
94+
/* isDisabled={enabled === undefined ? false : !enabled} */
9595
selectedKey={String(step)}
9696
onSelectionChange={selectStep}
9797
>

src/src/complex/SpectrumOneOfRenderer.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ const SpectrumOneOfRenderer = ({
142142
<>
143143
<Picker
144144
aria-label='Select'
145+
aria-labelledby='Select'
145146
isDisabled={enabled === undefined ? false : !enabled}
146147
onSelectionChange={handleTabChange}
147148
selectedKey={String(selectedIndex)}
@@ -174,7 +175,8 @@ const SpectrumOneOfRenderer = ({
174175
) : (
175176
<>
176177
<Tabs
177-
isDisabled={enabled === undefined ? false : !enabled}
178+
aria-label='Select'
179+
// isDisabled={enabled === undefined ? false : !enabled}
178180
selectedKey={String(selectedIndex)}
179181
onSelectionChange={handleTabChange}
180182
>
@@ -241,7 +243,6 @@ export const SpectrumOneOfRendererTester: RankedTester = (
241243
schema: JsonSchema,
242244
context: TesterContext
243245
) => {
244-
console.log('asdf', uischema, schema, context);
245246
return isOneOfControl(uischema, schema, context) ? 5 : -1;
246247
};
247248

tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"jsx": "react-jsx"
2020
},
2121
"include": ["src/src"],
22+
"exclude": ["node_modules", "dist"],
2223
"references": [{ "path": "./tsconfig.node.json" }]
2324
}

vite.config.ts

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,48 @@
11
import { defineConfig } from 'vite';
22
import { resolve } from 'path';
33
import react from '@vitejs/plugin-react';
4+
import dts from 'vite-plugin-dts';
5+
import cssInjectedByJsPlugin from 'vite-plugin-css-injected-by-js';
46

57
// https://vitejs.dev/config/
68
export default defineConfig({
79
build: {
10+
sourcemap: true,
811
lib: {
912
entry: resolve(__dirname, 'src/src/index.ts'),
1013
name: 'JsonForms React Spectrum Renderers',
11-
// the proper extensions will be added
12-
fileName: 'index',
14+
formats: ['es', 'umd'],
15+
fileName: (format) => `index.${format}.js`,
1316
},
1417
rollupOptions: {
1518
// make sure to externalize deps that shouldn't be bundled
1619
// into your library
17-
external: ['react'],
20+
external: [
21+
'react',
22+
'react-dom',
23+
'@jsonforms/core',
24+
'@jsonforms/react',
25+
'moment',
26+
],
1827
output: {
1928
// Provide global variables to use in the UMD build
2029
// for externalized deps
2130
globals: {
2231
react: 'React',
32+
'react-dom': 'ReactDOM',
2333
},
2434
},
2535
},
2636
},
27-
plugins: [react()],
37+
plugins: [
38+
react(),
39+
cssInjectedByJsPlugin(),
40+
dts({
41+
insertTypesEntry: true,
42+
}),
43+
],
44+
define: {
45+
'process.platform': null,
46+
'global.setImmediate': null,
47+
},
2848
});

0 commit comments

Comments
 (0)