Skip to content

fix: When deleting property during search in advanced panel - remove it from results #4950

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

Merged
merged 2 commits into from
Mar 5, 2025
Merged

fix: When deleting property during search in advanced panel - remove it from results #4950

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50c76ea
when deleteing property during search - remove it from results
kof Mar 5, 2025
a6e3b96
also delete from search result when deleting via property
kof Mar 5, 2025
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
31 changes: 25 additions & 6 deletions apps/builder/app/builder/shared/css-editor/css-editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ export const CssEditor = ({
},
}));

const advancedProperties = Array.from(styleMap.keys()) as Array<CssProperty>;
const advancedProperties = Array.from(styleMap.keys());

const currentProperties =
searchProperties ??
Expand Down Expand Up @@ -394,7 +394,7 @@ export const CssEditor = ({
keys: ["property", "value"],
}).map(({ property }) => property);

setSearchProperties(matched as CssProperty[]);
setSearchProperties(matched);
};

const afterChangingStyles = () => {
Expand All @@ -407,6 +407,25 @@ export const CssEditor = ({
});
};

const handleDeleteProperty: DeleteProperty = (property, options = {}) => {
onDeleteProperty(property, options);
if (options.isEphemeral === true) {
return;
}
setSearchProperties(
searchProperties?.filter((searchProperty) => searchProperty !== property)
);
};

const handleDeleteAllDeclarations = (styleMap: CssStyleMap) => {
setSearchProperties(
searchProperties?.filter(
(searchProperty) => styleMap.has(searchProperty) === false
)
);
onDeleteAllDeclarations(styleMap);
};

return (
<>
{showSearch && (
Expand All @@ -420,8 +439,8 @@ export const CssEditor = ({
)}
<CssEditorContextMenu
onPaste={handleInsertStyles}
onDeleteProperty={onDeleteProperty}
onDeleteAllDeclarations={onDeleteAllDeclarations}
onDeleteProperty={handleDeleteProperty}
onDeleteAllDeclarations={handleDeleteAllDeclarations}
styleMap={styleMap}
properties={
searchProperties ?? [...recentProperties, ...currentProperties]
Expand All @@ -446,7 +465,7 @@ export const CssEditor = ({
}
}}
onReset={afterChangingStyles}
onDeleteProperty={onDeleteProperty}
onDeleteProperty={handleDeleteProperty}
onSetProperty={onSetProperty}
/>
);
Expand Down Expand Up @@ -493,7 +512,7 @@ export const CssEditor = ({
<LazyRender key={property}>
<AdvancedDeclarationLonghand
property={property}
onDeleteProperty={onDeleteProperty}
onDeleteProperty={handleDeleteProperty}
onSetProperty={onSetProperty}
/>
</LazyRender>
Expand Down