Fix merge issues
This commit is contained in:
parent
ab96d6ee01
commit
f3f5532ad6
|
@ -1,7 +1,7 @@
|
||||||
<script>
|
<script>
|
||||||
import { helpers } from "@budibase/shared-core"
|
import { helpers } from "@budibase/shared-core"
|
||||||
import { DetailSummary, notifications } from "@budibase/bbui"
|
import { DetailSummary, notifications } from "@budibase/bbui"
|
||||||
import { componentStore } from "stores/builder"
|
import { componentStore, previewStore } from "stores/builder"
|
||||||
import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
|
import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
|
||||||
import ResetFieldsButton from "components/design/settings/controls/ResetFieldsButton.svelte"
|
import ResetFieldsButton from "components/design/settings/controls/ResetFieldsButton.svelte"
|
||||||
import EjectBlockButton from "components/design/settings/controls/EjectBlockButton.svelte"
|
import EjectBlockButton from "components/design/settings/controls/EjectBlockButton.svelte"
|
||||||
|
@ -27,7 +27,7 @@
|
||||||
tag,
|
tag,
|
||||||
includeHidden
|
includeHidden
|
||||||
)
|
)
|
||||||
$: context = $store.selectedComponentContext
|
$: context = $previewStore.selectedComponentContext
|
||||||
|
|
||||||
const getSections = (instance, definition, isScreen, tag, includeHidden) => {
|
const getSections = (instance, definition, isScreen, tag, includeHidden) => {
|
||||||
const settings = definition?.settings ?? []
|
const settings = definition?.settings ?? []
|
||||||
|
@ -148,7 +148,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
store.actions.preview.sendEvent("request-context")
|
previewStore.sendEvent("request-context")
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue