Skip to content

fix widget config immutability #80

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
persd wants to merge 1 commit into
base: astro
Choose a base branch
from
Open

fix widget config immutability #80

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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hat-ring-components",
"version": "3.4.1",
"version": "3.4.2",
"description": "Head App Template - RING components",
"license": "MIT",
"repository": {},
Expand Down
33 changes: 17 additions & 16 deletions src/components/Grid/Widget.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,39 +13,40 @@ interface GridWidgetParams {
boxName: string,
index: number,
};
let toRender: boolean | JSX.Element = false;
let toRender: boolean | string | JSX.Element = false;
const availableWidgets = context.customData.widgets;
const widgetName = _.upperFirst(widgetConfig.widgetType)
const widgetConfigCopy = structuredClone(widgetConfig);
widgetConfigCopy.gridLocation = WidgetHelper_buildWidgetLocation(sectionName, boxName, index);
const widgetName = _.upperFirst(widgetConfigCopy.widgetType)
const Component = availableWidgets[widgetName] as AbstractWidget;
widgetConfig.gridLocation = WidgetHelper_buildWidgetLocation(sectionName, boxName, index);

const cssClasses: Array<string> = ['gridWidget']

if(WidgetHelper_shouldHideWidget(widgetConfig, context)) {
toRender = WidgetHelper_renderEmptyComponent(`gridWidget gridWidgetType${_.upperFirst(widgetConfig.widgetType)}`);
if(WidgetHelper_shouldHideWidget(widgetConfigCopy, context)) {
toRender = WidgetHelper_renderEmptyComponent(`gridWidget gridWidgetType${_.upperFirst(widgetConfigCopy.widgetType)}`);
}

if (widgetConfig.widgetType) {
cssClasses.push(`gridWidgetType${_.upperFirst(widgetConfig.widgetType)}`);
if (widgetConfigCopy.widgetType) {
cssClasses.push(`gridWidgetType${_.upperFirst(widgetConfigCopy.widgetType)}`);
}

if (widgetConfig.customWidth && widgetConfig.customWidth !== 'none') {
cssClasses.push(`gridWidth${widgetConfig.customWidth}`);
if (widgetConfigCopy.customWidth && widgetConfigCopy.customWidth !== 'none') {
cssClasses.push(`gridWidth${widgetConfigCopy.customWidth}`);
}

if (widgetConfig.customPosition && widgetConfig.customPosition !== 'none') {
cssClasses.push(`gridPosition${_.upperFirst(widgetConfig.customPosition)}`);
if (widgetConfigCopy.customPosition && widgetConfigCopy.customPosition !== 'none') {
cssClasses.push(`gridPosition${_.upperFirst(widgetConfigCopy.customPosition)}`);
}

if (['wrapperStart'].includes(widgetConfig.widgetType)) {
widgetConfig.customClass = `${cssClasses.join(' ')} ${widgetConfig.customClass}`;
if (['wrapperStart'].includes(widgetConfigCopy.widgetType)) {
widgetConfigCopy.customClass = `${cssClasses.join(' ')} ${widgetConfigCopy.customClass}`;
}

---

{toRender ? <Fragment set:html={toRender}/> :
['wrapperStart', 'wrapperEnd'].includes(widgetConfig.widgetType) ? <Component widgetConfig={widgetConfig} context={context}/>
: <div id={widgetConfig.gridLocation} class={cssClasses.join(' ')}>
{Component && <Component widgetConfig={widgetConfig} context={context}/>}
['wrapperStart', 'wrapperEnd'].includes(widgetConfigCopy.widgetType) ? <Component widgetConfig={widgetConfigCopy} context={context}/>
: <div id={widgetConfigCopy.gridLocation} class={cssClasses.join(' ')}>
{Component && <Component widgetConfig={widgetConfigCopy} context={context}/>}
</div>
}