Skip to content

Commit

Permalink
fix bug with styles
Browse files Browse the repository at this point in the history
  • Loading branch information
pieter-berkel committed Jan 17, 2024
1 parent 5128a35 commit f4c2565
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 11 deletions.
8 changes: 8 additions & 0 deletions examples/next/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# next-example

## 0.1.9

### Patch Changes

- Updated dependencies
- @simple-builder/react@1.0.8
- @simple-builder/server@1.0.8

## 0.1.8

### Patch Changes
Expand Down
23 changes: 16 additions & 7 deletions examples/next/app/[[...slug]]/builder-registery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,22 @@ builder.register(
defaultValue: "Hello World",
},
],
// defaultStyles: {
// container: false,
// // desktop: {
// // color: "#ffffff",
// // background: "#000000",
// // },
// },
defaultStyles: {
container: false,
desktop: {
color: "#ffffff",
background: "#cecece",
margin: "0 16px",
padding: "0 24px",
"border-radius": "25px",
overflow: "hidden",
},
mobile: {
"border-radius": "0px",
padding: "0px",
margin: "0px",
},
},
},
);

Expand Down
2 changes: 1 addition & 1 deletion examples/next/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "next-example",
"version": "0.1.8",
"version": "0.1.9",
"private": true,
"scripts": {
"dev": "next dev",
Expand Down
8 changes: 8 additions & 0 deletions packages/react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @simple-builder/react

## 1.0.8

### Patch Changes

- fix bug with styles
- Updated dependencies
- @simple-builder/server@1.0.8

## 1.0.7

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@simple-builder/react",
"version": "1.0.7",
"version": "1.0.8",
"private": false,
"description": "React package for the simple builder package.",
"repository": "https://github.com/pieter-berkel/simple-builder.git",
Expand Down
9 changes: 8 additions & 1 deletion packages/react/src/components/item-design-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,13 @@ export const ItemDesignForm = (props: ItemDesignFormProps) => {
const getPatchedDeviceValues = (
device: "desktop" | "mobile" = "desktop",
) => {
const initital = Object.keys(item.styles?.[device] || {})
.filter((key) => !Object.keys(values[device]).includes(key))
.reduce(
(acc, key) => ({ ...acc, [key]: item.styles?.[device][key] }),
{},
);

// @ts-expect-error TODO: fix this
return Object.entries(values[device]).reduce((acc, [key, value]) => {
let res = value;
Expand All @@ -177,7 +184,7 @@ export const ItemDesignForm = (props: ItemDesignFormProps) => {
...acc,
...(res ? { [key]: res } : {}),
};
}, {});
}, initital);
};

const patchedDesktopValues = getPatchedDeviceValues();
Expand Down
6 changes: 6 additions & 0 deletions packages/server/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @simple-builder/server

## 1.0.8

### Patch Changes

- fix bug with styles

## 1.0.7

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@simple-builder/server",
"version": "1.0.7",
"version": "1.0.8",
"private": false,
"description": "Server package for the simple builder package.",
"repository": "https://github.com/pieter-berkel/simple-builder.git",
Expand Down

0 comments on commit f4c2565

Please sign in to comment.