MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove some unnecessary code

This commit is contained in:
Andrew Kingston 2022-10-24 13:28:22 +01:00
parent be10c64984
commit c6ddbb6d04
2 changed files with 13 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/componentStyles.js
View File

@ -1,67 +1,6 @@
import { Input, Select } from "@budibase/bbui" import { Input, Select } from "@budibase/bbui"
import ColorPicker from "components/design/settings/controls/ColorPicker.svelte" import ColorPicker from "components/design/settings/controls/ColorPicker.svelte"
export const grid = {
label: "Grid",
columns: "1fr 1fr",
settings: [
{
label: "Col. start",
key: "grid-column-start",
control: Select,
placeholder: "Auto",
options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
},
{
label: "Col. end",
key: "grid-column-end",
control: Select,
placeholder: "Auto",
options: [
{ label: "1", value: 2 },
{ label: "2", value: 3 },
{ label: "3", value: 4 },
{ label: "4", value: 5 },
{ label: "5", value: 6 },
{ label: "6", value: 7 },
{ label: "7", value: 8 },
{ label: "8", value: 9 },
{ label: "9", value: 10 },
{ label: "10", value: 11 },
{ label: "11", value: 12 },
{ label: "12", value: 13 },
],
},
{
label: "Row start",
key: "grid-row-start",
control: Select,
placeholder: "Auto",
options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
},
{
label: "Row end",
key: "grid-row-end",
control: Select,
placeholder: "Auto",
options: [
{ label: "1", value: 2 },
{ label: "2", value: 3 },
{ label: "3", value: 4 },
{ label: "4", value: 5 },
{ label: "5", value: 6 },
{ label: "6", value: 7 },
{ label: "7", value: 8 },
{ label: "8", value: 9 },
{ label: "9", value: 10 },
{ label: "10", value: 11 },
{ label: "11", value: 12 },
{ label: "12", value: 13 },
],
},
],
}
export const margin = { export const margin = {
label: "Margin", label: "Margin",
columns: "1fr 1fr", columns: "1fr 1fr",

30
packages/client/src/components/Component.svelte
View File

@ -170,26 +170,23 @@
$: pad = pad || (interactive && hasChildren && inDndPath) $: pad = pad || (interactive && hasChildren && inDndPath)
$: $dndIsDragging, (pad = false) $: $dndIsDragging, (pad = false)
// Compute overall styles
$: styles = {
...instance._styles,
normal: {
...instance._styles?.normal,
...ephemeralStyles,
},
custom: customCSS,
id,
empty: emptyState,
interactive,
draggable,
editable,
}
// Update component context // Update component context
$: store.set({ $: store.set({
id, id,
children: children.length, children: children.length,
styles, styles: {
...instance._styles,
normal: {
...instance._styles?.normal,
...ephemeralStyles,
},
custom: customCSS,
id,
empty: emptyState,
interactive,
draggable,
editable,
},
empty: emptyState, empty: emptyState,
selected, selected,
name, name,
@ -458,7 +455,6 @@
componentStore.actions.registerInstance(id, { componentStore.actions.registerInstance(id, {
component: instance._component, component: instance._component,
getSettings: () => cachedSettings, getSettings: () => cachedSettings,
getStyles: () => styles,
getRawSettings: () => ({ ...staticSettings, ...dynamicSettings }), getRawSettings: () => ({ ...staticSettings, ...dynamicSettings }),
getDataContext: () => get(context), getDataContext: () => get(context),
reload: () => initialise(instance, true), reload: () => initialise(instance, true),