diff --git a/packages/angular-material/package.json b/packages/angular-material/package.json
index 5e7841859..c99131690 100644
--- a/packages/angular-material/package.json
+++ b/packages/angular-material/package.json
@@ -70,7 +70,7 @@
"@angular/router": "^17.0.0 || ^18.0.0",
"@jsonforms/angular": "3.4.0-alpha.2",
"@jsonforms/core": "3.4.0-alpha.2",
- "dayjs": "^1.11.7",
+ "dayjs": "^1.11.10",
"rxjs": "^6.6.0 || ^7.4.0"
},
"dependencies": {
diff --git a/packages/core/src/mappers/renderer.ts b/packages/core/src/mappers/renderer.ts
index a3ba1a034..2a80de8e6 100644
--- a/packages/core/src/mappers/renderer.ts
+++ b/packages/core/src/mappers/renderer.ts
@@ -1249,6 +1249,7 @@ export const mapStateToLabelProps = (
config: getConfig(state),
renderers: props.renderers || getRenderers(state),
cells: props.cells || getCells(state),
+ uischema,
};
};
diff --git a/packages/core/src/util/schema.ts b/packages/core/src/util/schema.ts
index 26161b588..72be3dd7e 100644
--- a/packages/core/src/util/schema.ts
+++ b/packages/core/src/util/schema.ts
@@ -26,16 +26,27 @@
import find from 'lodash/find';
import type { JsonSchema } from '../models';
-export const getFirstPrimitiveProp = (schema: any) => {
- if (schema.properties) {
- return find(Object.keys(schema.properties), (propName) => {
- const prop = schema.properties[propName];
- return (
- prop.type === 'string' ||
- prop.type === 'number' ||
- prop.type === 'integer'
- );
- });
+export const getFirstPrimitiveProp = (schema: unknown) => {
+ if (
+ schema &&
+ typeof schema === 'object' &&
+ 'properties' in schema &&
+ schema.properties
+ ) {
+ return find(
+ Object.keys(schema.properties),
+ (propName: keyof typeof schema.properties) => {
+ const prop: unknown = schema.properties[propName];
+ return (
+ prop &&
+ typeof prop === 'object' &&
+ 'type' in prop &&
+ (prop.type === 'string' ||
+ prop.type === 'number' ||
+ prop.type === 'integer')
+ );
+ }
+ );
}
return undefined;
};
diff --git a/packages/material-renderers/package.json b/packages/material-renderers/package.json
index 626210e29..f9940bcef 100644
--- a/packages/material-renderers/package.json
+++ b/packages/material-renderers/package.json
@@ -79,8 +79,8 @@
]
},
"dependencies": {
- "@date-io/dayjs": "1.3.13",
- "dayjs": "1.10.7",
+ "@date-io/dayjs": "^3.0.0",
+ "dayjs": "^1.11.10",
"lodash": "^4.17.21"
},
"peerDependencies": {
diff --git a/packages/vue-vuetify/dev/App.vue b/packages/vue-vuetify/dev/App.vue
index e3434f232..eab6fa09b 100644
--- a/packages/vue-vuetify/dev/App.vue
+++ b/packages/vue-vuetify/dev/App.vue
@@ -36,10 +36,12 @@ const theme = computed(() => {
-
-
-
-
+
+
+
+
+
+
diff --git a/packages/vue-vuetify/dev/components/ExampleDrawer.vue b/packages/vue-vuetify/dev/components/ExampleDrawer.vue
index 6c7378a1e..c662f1281 100644
--- a/packages/vue-vuetify/dev/components/ExampleDrawer.vue
+++ b/packages/vue-vuetify/dev/components/ExampleDrawer.vue
@@ -4,6 +4,10 @@ import examples from '../examples';
import { useAppStore } from '../store';
const appStore = useAppStore();
+
+const handleExampleClick = (exampleName: string) => {
+ appStore.exampleName = exampleName;
+};
@@ -28,10 +32,9 @@ const appStore = useAppStore();
:value="example.name"
link
color="primary"
+ @click="handleExampleClick(example.name)"
>
- {{
- example.label
- }}
+ {{ example.label }}
diff --git a/packages/vue-vuetify/example/index.bundled.html b/packages/vue-vuetify/example/index.bundled.html
deleted file mode 100644
index 19cd2d30d..000000000
--- a/packages/vue-vuetify/example/index.bundled.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
- JSON Forms Vue 3 Vuetify
-
-
-
-
-
-
diff --git a/packages/vue-vuetify/index.html b/packages/vue-vuetify/index.html
index a8f0512cd..05c4e10c5 100644
--- a/packages/vue-vuetify/index.html
+++ b/packages/vue-vuetify/index.html
@@ -2,7 +2,6 @@
-
{
const ajv = createAjvCore(options);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9733264b8..3f7fad116 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -608,11 +608,11 @@ importers:
packages/material-renderers:
dependencies:
'@date-io/dayjs':
- specifier: 1.3.13
- version: 1.3.13(dayjs@1.10.7)
+ specifier: ^3.0.0
+ version: 3.0.0(dayjs@1.11.11)
dayjs:
- specifier: 1.10.7
- version: 1.10.7
+ specifier: ^1.11.10
+ version: 1.11.11
lodash:
specifier: ^4.17.21
version: 4.17.21
@@ -637,7 +637,7 @@ importers:
version: 5.13.7(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@17.0.80)(react-dom@17.0.2)(react@17.0.2)
'@mui/x-date-pickers':
specifier: ^7.7.1
- version: 7.7.1(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@mui/material@5.13.7)(@types/react@17.0.80)(dayjs@1.10.7)(react-dom@17.0.2)(react@17.0.2)
+ version: 7.7.1(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@mui/material@5.13.7)(@types/react@17.0.80)(dayjs@1.11.11)(react-dom@17.0.2)(react@17.0.2)
'@rollup/plugin-commonjs':
specifier: ^23.0.3
version: 23.0.7(rollup@2.79.1)
@@ -1306,7 +1306,7 @@ importers:
specifier: ^7.0.2
version: 7.0.3
dayjs:
- specifier: ^1.10.6
+ specifier: ^1.11.10
version: 1.11.11
eslint:
specifier: ^8.57.0
@@ -4312,17 +4312,20 @@ packages:
'@jridgewell/trace-mapping': 0.3.9
dev: true
- /@date-io/core@1.3.13:
- resolution: {integrity: sha512-AlEKV7TxjeK+jxWVKcCFrfYAk8spX9aCyiToFIiLPtfQbsjmRGLIhb5VZgptQcJdHtLXo7+m0DuurwFgUToQuA==}
+ /@date-io/core@3.0.0:
+ resolution: {integrity: sha512-S3j+IAQVBYNkQzchVVhX40eBkGDreBpScy9RXwTS5j2+k07+62pMVPisQ44Gq76Rqy5AOG/EZXCwBpY/jbemvA==}
dev: false
- /@date-io/dayjs@1.3.13(dayjs@1.10.7):
- resolution: {integrity: sha512-nD39xWYwQjDMIdpUzHIcADHxY9m1hm1DpOaRn3bc2rBdgmwQC0PfW0WYaHyGGP/6LEzEguINRbHuotMhf+T9Sg==}
+ /@date-io/dayjs@3.0.0(dayjs@1.11.11):
+ resolution: {integrity: sha512-vy7DSwoQiPA2L0stRqW3le7lcEBMjoMMEmbpCNkyoX3xXizKInFvhbnOBmCyusIQ7tL/WsNC4X5bVgdNWX0JLA==}
peerDependencies:
dayjs: ^1.8.17
+ peerDependenciesMeta:
+ dayjs:
+ optional: true
dependencies:
- '@date-io/core': 1.3.13
- dayjs: 1.10.7
+ '@date-io/core': 3.0.0
+ dayjs: 1.11.11
dev: false
/@discoveryjs/json-ext@0.5.7:
@@ -6933,7 +6936,7 @@ packages:
react-is: 18.3.1
dev: true
- /@mui/x-date-pickers@7.7.1(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@mui/material@5.13.7)(@types/react@17.0.80)(dayjs@1.10.7)(react-dom@17.0.2)(react@17.0.2):
+ /@mui/x-date-pickers@7.7.1(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@mui/material@5.13.7)(@types/react@17.0.80)(dayjs@1.11.11)(react-dom@17.0.2)(react@17.0.2):
resolution: {integrity: sha512-p7/TY8QcdQd6RelNqzW5q89GeUFctvZnDHTfQVEC0l0nAy7ArE6u21uNF8QWGrijZoJXCM+OlIRzlZADaUPpWA==}
engines: {node: '>=14.0.0'}
peerDependencies:
@@ -6978,7 +6981,7 @@ packages:
'@mui/utils': 5.15.20(@types/react@17.0.80)(react@17.0.2)
'@types/react-transition-group': 4.4.10
clsx: 2.1.1
- dayjs: 1.10.7
+ dayjs: 1.11.11
prop-types: 15.8.1
react: 17.0.2
react-dom: 17.0.2(react@17.0.2)
@@ -13700,12 +13703,8 @@ packages:
resolution: {integrity: sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==}
dev: true
- /dayjs@1.10.7:
- resolution: {integrity: sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==}
-
/dayjs@1.11.11:
resolution: {integrity: sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==}
- dev: true
/de-indent@1.0.2:
resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==}