Skip to content

draft: allow control-wrapper to be overridden by provided component #2443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −3
Open

draft: allow control-wrapper to be overridden by provided component #2443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions packages/vue-vuetify/src/controls/DateControlRenderer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<template>
<control-wrapper
<component
:is="resolvedWrapper"
v-bind="controlWrapper"
:control="control"
:styles="styles"
:isFocused="isFocused"
:appliedOptions="appliedOptions"
Expand Down Expand Up @@ -73,12 +75,12 @@
</v-menu>
</template>
</v-text-field>
</control-wrapper>
</component>
</template>

<script lang="ts">
import { type ControlElement, type JsonSchema } from '@jsonforms/core';
import { computed, defineComponent, ref, unref } from 'vue';
import { computed, defineComponent, inject, ref, unref } from 'vue';

import {
rendererProps,
Expand Down Expand Up @@ -140,6 +142,7 @@ const controlRenderer = defineComponent({
const adaptValue = (value: any) => value || undefined;
const control = useVuetifyControl(useJsonFormsControl(props), adaptValue);

const resolvedWrapper = inject('controlWrapperOverride', ControlWrapper);
const dateFormat = computed<string>(
() =>
typeof control.appliedOptions.value.dateFormat == 'string'
Expand Down Expand Up @@ -176,6 +179,7 @@ const controlRenderer = defineComponent({
options,
useMask,
maskCompleted,
resolvedWrapper,
};
},
computed: {
Expand Down
6 changes: 6 additions & 0 deletions packages/vue-vuetify/src/util/composition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@ import {
inject,
provide,
ref,
type Component,
type ComputedRef,
type InjectionKey,
} from 'vue';
import type { IconOptions } from 'vuetify';
import { useStyles } from '../styles';
import { ControlWrapper } from '@/controls';

export const IconSymbol: InjectionKey<Required<IconOptions>> =
Symbol.for('vuetify:icons');
Expand Down Expand Up @@ -481,3 +483,7 @@ export const useIcons = () => {
current: iconSet,
};
};

export const useControlWrapper = () => {
return inject('vuetify:control-wrapper', ControlWrapper);
};
Loading