diff --git a/CHANGELOG.md b/CHANGELOG.md index 82616abcc..874e16ad0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,10 @@ All notable, unreleased changes to this project will be documented in this file. - Add shipping method description - #1058 by @jwm0 - Fix voucher and sales sorting errors - #1063 by @orzechdev - Fix custom currency formatting - #1067 by @orzechdev +- Fixes - #1077 by @piotrgrundas: + - rich text field updates, + - multiselect empty chip upon creation of a product/variant, + - useFormset.setItemValue wrong updates, # 2.11.1 diff --git a/src/attributes/utils/data.ts b/src/attributes/utils/data.ts index cb52a11fd..9bfcacedc 100644 --- a/src/attributes/utils/data.ts +++ b/src/attributes/utils/data.ts @@ -80,6 +80,9 @@ export function getSelectedAttributeValues( if (attribute.attribute.inputType === AttributeInputTypeEnum.REFERENCE) { return attribute.values.map(value => value.reference); } + if (attribute.attribute.inputType === AttributeInputTypeEnum.RICH_TEXT) { + return [attribute.values[0]?.richText]; + } return attribute.values.map(value => value.slug); } diff --git a/src/hooks/useFormset.ts b/src/hooks/useFormset.ts index 108775c19..75c12024b 100644 --- a/src/hooks/useFormset.ts +++ b/src/hooks/useFormset.ts @@ -46,15 +46,17 @@ function useFormset( } function setItemValue(id: string, value: TValue) { - const itemIndex = data.findIndex(item => item.id === id); - setData([ - ...data.slice(0, itemIndex), - { - ...data[itemIndex], - value - }, - ...data.slice(itemIndex + 1) - ]); + setData(data => { + const itemIndex = data.findIndex(item => item.id === id); + return [ + ...data.slice(0, itemIndex), + { + ...data[itemIndex], + value + }, + ...data.slice(itemIndex + 1) + ]; + }); } return { diff --git a/src/products/components/ProductVariantPage/form.tsx b/src/products/components/ProductVariantPage/form.tsx index c130f6349..69346a6c3 100644 --- a/src/products/components/ProductVariantPage/form.tsx +++ b/src/products/components/ProductVariantPage/form.tsx @@ -135,8 +135,6 @@ function useProductVariantUpdateForm( makeChangeHandler: makeMetadataChangeHandler } = useMetadataChangeTrigger(); - // console.log({ attributes, initial }); - const handleChange: FormChange = (event, cb) => { form.change(event, cb); triggerChange(); diff --git a/src/products/utils/data.ts b/src/products/utils/data.ts index b1b6d31ec..710e73c8d 100644 --- a/src/products/utils/data.ts +++ b/src/products/utils/data.ts @@ -92,7 +92,7 @@ export function getAttributeInputFromAttributes( }, id: attribute.id, label: attribute.name, - value: [""] + value: [] })); }