Skip to content

Commit f484afc

Browse files
committed
VariantManagement: add nativeDetail again & fix tests
1 parent 79b9b20 commit f484afc

File tree

2 files changed

+29
-11
lines changed

2 files changed

+29
-11
lines changed

packages/main/src/components/VariantManagement/VariantManagement.cy.tsx

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -391,10 +391,11 @@ describe('VariantManagement', () => {
391391
it('Save As', () => {
392392
const TestComp = ({ onSaveAs }: { onSaveAs: VariantManagementPropTypes['onSaveAs'] }) => {
393393
const [saved, setSaved] = useState(undefined);
394-
const handleSaveAs = (e) => {
394+
const handleSaveAs: VariantManagementPropTypes['onSaveAs'] = (e) => {
395395
onSaveAs(e);
396-
const { variantItem: _0, ...rest } = e.detail;
397-
setSaved(rest);
396+
console.log(e.detail);
397+
const { variantItem: _0, children, global, isDefault, nativeDetail, selected, applyAutomatically } = e.detail;
398+
setSaved({ nativeDetail, selected, children, isDefault, global, applyAutomatically });
398399
};
399400
return (
400401
<>
@@ -494,11 +495,15 @@ describe('VariantManagement', () => {
494495
showOnlyFavorites?: VariantManagementPropTypes['showOnlyFavorites'];
495496
}) => {
496497
const [save, setSave] = useState(undefined);
497-
const handleSave = (e) => {
498+
const handleSave: VariantManagementPropTypes['onSaveManageViews'] = (e) => {
499+
const { deletedVariants, prevVariants, updatedVariants, variants, nativeDetail } = e.detail;
498500
onSaveManageViews(e);
499501
setSave({
500-
...e.detail,
501-
variants: e.detail.variants.map((item) => {
502+
nativeDetail,
503+
deletedVariants,
504+
prevVariants,
505+
updatedVariants,
506+
variants: variants.map((item) => {
502507
const { variantItem: _0, ...rest } = item;
503508
return rest;
504509
}),
@@ -631,11 +636,15 @@ describe('VariantManagement', () => {
631636
onSaveManageViews: VariantManagementPropTypes['onSaveManageViews'];
632637
}) => {
633638
const [save, setSave] = useState(undefined);
634-
const handleSave = (e) => {
639+
const handleSave: VariantManagementPropTypes['onSaveManageViews'] = (e) => {
640+
const { deletedVariants, prevVariants, updatedVariants, variants, nativeDetail } = e.detail;
635641
onSaveManageViews(e);
636642
setSave({
637-
...e.detail,
638-
variants: e.detail.variants.map((item) => {
643+
nativeDetail,
644+
deletedVariants,
645+
prevVariants,
646+
updatedVariants,
647+
variants: variants.map((item) => {
639648
const { variantItem: _0, ...rest } = item;
640649
return rest;
641650
}),

packages/main/src/components/VariantManagement/index.tsx

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@ const VariantManagement = forwardRef<HTMLDivElement, VariantManagementPropTypes>
208208

209209
const handleSaveView = (e, selectedVariant) => {
210210
if (typeof onSaveAs === 'function') {
211-
onSaveAs(enrichEventWithDetails(e, selectedVariant));
211+
//todo: remove nativeDetail in next major
212+
onSaveAs(enrichEventWithDetails(e, { ...selectedVariant, nativeDetail: e.detail.originalEvent.detail }));
212213
}
213214
setSelectedVariant(selectedVariant);
214215
if (!e.defaultPrevented) {
@@ -218,7 +219,13 @@ const VariantManagement = forwardRef<HTMLDivElement, VariantManagementPropTypes>
218219

219220
const handleSaveManageViews = (e, payload) => {
220221
const { defaultView, updatedRows, deletedRows } = payload;
221-
const callbackProperties = { deletedVariants: [], prevVariants: [], updatedVariants: [], variants: [] };
222+
const callbackProperties = {
223+
deletedVariants: [],
224+
prevVariants: [],
225+
updatedVariants: [],
226+
variants: [],
227+
nativeDetail: null,
228+
};
222229
setSafeChildren((prev) =>
223230
Children.toArray(
224231
prev.map((child) => {
@@ -260,6 +267,8 @@ const VariantManagement = forwardRef<HTMLDivElement, VariantManagementPropTypes>
260267
),
261268
);
262269
if (typeof onSaveManageViews === 'function') {
270+
//todo: remove in next major
271+
callbackProperties.nativeDetail = e.detail.originalEvent.detail;
263272
onSaveManageViews(enrichEventWithDetails(e, callbackProperties));
264273
}
265274
if (!e.defaultPrevented) {

0 commit comments

Comments
 (0)