From 545c71dac8c56a1b56e1fed0f516be8a3fe802b1 Mon Sep 17 00:00:00 2001 From: David Featherston Date: Thu, 6 Jul 2023 08:49:23 +1000 Subject: [PATCH] feat(@dpc-sdp/ripple-ui-forms): adding component events --- packages/ripple-ui-forms/src/components/RplForm/RplForm.vue | 2 +- .../src/components/RplFormDate/RplFormDate.vue | 3 +-- .../src/components/RplFormDropdown/RplFormDropdown.vue | 3 +-- .../src/components/RplFormInput/RplFormInput.vue | 1 - .../components/RplFormOptionButtons/RplFormOptionButtons.vue | 3 +-- .../src/components/RplFormOptions/RplFormCheckboxGroup.vue | 3 +-- .../src/components/RplFormOptions/RplFormOption.vue | 3 +-- .../src/components/RplFormOptions/RplFormRadioGroup.vue | 3 +-- .../src/components/RplFormTextarea/RplFormTextarea.vue | 4 +--- 9 files changed, 8 insertions(+), 17 deletions(-) diff --git a/packages/ripple-ui-forms/src/components/RplForm/RplForm.vue b/packages/ripple-ui-forms/src/components/RplForm/RplForm.vue index ac77a60d45..2c868c8b30 100644 --- a/packages/ripple-ui-forms/src/components/RplForm/RplForm.vue +++ b/packages/ripple-ui-forms/src/components/RplForm/RplForm.vue @@ -133,7 +133,7 @@ watch( id: props.id, action: 'submit', name: props.title, - label: + text: props.schema?.find((field) => field?.key === 'actions')?.label || 'Submit' }, diff --git a/packages/ripple-ui-forms/src/components/RplFormDate/RplFormDate.vue b/packages/ripple-ui-forms/src/components/RplFormDate/RplFormDate.vue index def393fa93..63967646f2 100644 --- a/packages/ripple-ui-forms/src/components/RplFormDate/RplFormDate.vue +++ b/packages/ripple-ui-forms/src/components/RplFormDate/RplFormDate.vue @@ -215,8 +215,7 @@ const handleUpdate = (event) => { ...event, id: props.id, field: 'date', - label: props?.label, - value: `${internalDay.value}-${internalMonth.value}-${internalYear.value}` + label: props?.label }, { global: true } ) diff --git a/packages/ripple-ui-forms/src/components/RplFormDropdown/RplFormDropdown.vue b/packages/ripple-ui-forms/src/components/RplFormDropdown/RplFormDropdown.vue index 818a292325..4c539b3d46 100644 --- a/packages/ripple-ui-forms/src/components/RplFormDropdown/RplFormDropdown.vue +++ b/packages/ripple-ui-forms/src/components/RplFormDropdown/RplFormDropdown.vue @@ -53,7 +53,7 @@ const emit = defineEmits<{ }>() const form: object = inject('form') -const { emitRplEvent } = useRippleEvent('rpl-form-input', emit) +const { emitRplEvent } = useRippleEvent('rpl-form-dropdown', emit) const containerRef = ref(null) const inputRef = ref(null) @@ -173,7 +173,6 @@ const handleSelectOption = (optionValue) => { 'update', { action: 'select', - field: 'dropdown', id: props.id, label: props?.label, value: newValue, diff --git a/packages/ripple-ui-forms/src/components/RplFormInput/RplFormInput.vue b/packages/ripple-ui-forms/src/components/RplFormInput/RplFormInput.vue index d4b87af388..716a0929f0 100644 --- a/packages/ripple-ui-forms/src/components/RplFormInput/RplFormInput.vue +++ b/packages/ripple-ui-forms/src/components/RplFormInput/RplFormInput.vue @@ -88,7 +88,6 @@ const handleChange = () => { id: props.id, type: props.type, label: props?.label, - value: props.value, contextId: form?.id, contextName: form?.name }, diff --git a/packages/ripple-ui-forms/src/components/RplFormOptionButtons/RplFormOptionButtons.vue b/packages/ripple-ui-forms/src/components/RplFormOptionButtons/RplFormOptionButtons.vue index 396dff7208..6ca754475e 100644 --- a/packages/ripple-ui-forms/src/components/RplFormOptionButtons/RplFormOptionButtons.vue +++ b/packages/ripple-ui-forms/src/components/RplFormOptionButtons/RplFormOptionButtons.vue @@ -35,7 +35,7 @@ const emit = defineEmits<{ }>() const form: object = inject('form') -const { emitRplEvent } = useRippleEvent('rpl-form-input', emit) +const { emitRplEvent } = useRippleEvent('rpl-form-option-buttons', emit) const handleChange = (selectedId: string) => { useFormkitFriendlyEventEmitter(props, emit, 'onChange', selectedId) @@ -44,7 +44,6 @@ const handleChange = (selectedId: string) => { 'update', { action: 'select', - field: 'option-buttons', id: props.id, label: props?.label, value: selectedId, diff --git a/packages/ripple-ui-forms/src/components/RplFormOptions/RplFormCheckboxGroup.vue b/packages/ripple-ui-forms/src/components/RplFormOptions/RplFormCheckboxGroup.vue index 8227ea95f9..cc4e3abb46 100644 --- a/packages/ripple-ui-forms/src/components/RplFormOptions/RplFormCheckboxGroup.vue +++ b/packages/ripple-ui-forms/src/components/RplFormOptions/RplFormCheckboxGroup.vue @@ -34,7 +34,7 @@ const emit = defineEmits<{ }>() const form: object = inject('form') -const { emitRplEvent } = useRippleEvent('rpl-form-input', emit) +const { emitRplEvent } = useRippleEvent('rpl-form-checkbox-group', emit) const handleToggle = (selectedValue: string) => { let newValue @@ -59,7 +59,6 @@ const handleToggle = (selectedValue: string) => { { action: 'select', id: props.id, - field: 'checkbox-group', label: props?.label, value: newValue, contextId: form?.id, diff --git a/packages/ripple-ui-forms/src/components/RplFormOptions/RplFormOption.vue b/packages/ripple-ui-forms/src/components/RplFormOptions/RplFormOption.vue index 4fba01e49a..65a44977c4 100644 --- a/packages/ripple-ui-forms/src/components/RplFormOptions/RplFormOption.vue +++ b/packages/ripple-ui-forms/src/components/RplFormOptions/RplFormOption.vue @@ -44,7 +44,7 @@ const emit = defineEmits<{ }>() const form: object = inject('form') -const { emitRplEvent } = useRippleEvent('rpl-form-input', emit) +const { emitRplEvent } = useRippleEvent('rpl-form-option', emit) const classes = computed(() => { return ['rpl-form-option', `rpl-form-option--${props.variant}`] @@ -61,7 +61,6 @@ const handleChange = (e: Event) => { { action: 'select', id: props.id, - field: 'option', type: props.type, label: props?.label, value: newValue, diff --git a/packages/ripple-ui-forms/src/components/RplFormOptions/RplFormRadioGroup.vue b/packages/ripple-ui-forms/src/components/RplFormOptions/RplFormRadioGroup.vue index 7424ee3d0b..ee3d7c878f 100644 --- a/packages/ripple-ui-forms/src/components/RplFormOptions/RplFormRadioGroup.vue +++ b/packages/ripple-ui-forms/src/components/RplFormOptions/RplFormRadioGroup.vue @@ -37,7 +37,7 @@ const emit = defineEmits<{ }>() const form: object = inject('form') -const { emitRplEvent } = useRippleEvent('rpl-form-input', emit) +const { emitRplEvent } = useRippleEvent('rpl-form-radio-group', emit) const handleChange = (selectedValue: string) => { useFormkitFriendlyEventEmitter(props, emit, 'onChange', selectedValue) @@ -47,7 +47,6 @@ const handleChange = (selectedValue: string) => { { action: 'select', id: props.id, - field: 'radio-group', label: props?.label, value: selectedValue, contextId: form?.id, diff --git a/packages/ripple-ui-forms/src/components/RplFormTextarea/RplFormTextarea.vue b/packages/ripple-ui-forms/src/components/RplFormTextarea/RplFormTextarea.vue index 2e47514407..a9aab26d3a 100644 --- a/packages/ripple-ui-forms/src/components/RplFormTextarea/RplFormTextarea.vue +++ b/packages/ripple-ui-forms/src/components/RplFormTextarea/RplFormTextarea.vue @@ -45,7 +45,7 @@ const emit = defineEmits<{ const form: object = inject('form') -const { emitRplEvent } = useRippleEvent('rpl-form-input', emit) +const { emitRplEvent } = useRippleEvent('rpl-form-textarea', emit) const classes = computed(() => { return { @@ -61,10 +61,8 @@ const handleChange = () => { 'update', { action: 'exit', - field: 'textarea', id: props.id, label: props?.label, - value: props.value, contextId: form?.id, contextName: form?.name },