Merge pull request #2353 from Budibase/mobile-awareness
Bindings for device type
This commit is contained in:
commit
94090d7a96
|
@ -17,7 +17,13 @@ export const getBindableProperties = (asset, componentId) => {
|
||||||
const contextBindings = getContextBindings(asset, componentId)
|
const contextBindings = getContextBindings(asset, componentId)
|
||||||
const userBindings = getUserBindings()
|
const userBindings = getUserBindings()
|
||||||
const urlBindings = getUrlBindings(asset)
|
const urlBindings = getUrlBindings(asset)
|
||||||
return [...contextBindings, ...userBindings, ...urlBindings]
|
const deviceBindings = getDeviceBindings()
|
||||||
|
return [
|
||||||
|
...deviceBindings,
|
||||||
|
...urlBindings,
|
||||||
|
...contextBindings,
|
||||||
|
...userBindings,
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -221,6 +227,27 @@ const getUserBindings = () => {
|
||||||
return bindings
|
return bindings
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets all device bindings that are globally available.
|
||||||
|
*/
|
||||||
|
const getDeviceBindings = () => {
|
||||||
|
let bindings = []
|
||||||
|
if (get(store).clientFeatures?.deviceAwareness) {
|
||||||
|
const safeDevice = makePropSafe("device")
|
||||||
|
bindings.push({
|
||||||
|
type: "context",
|
||||||
|
runtimeBinding: `${safeDevice}.${makePropSafe("mobile")}`,
|
||||||
|
readableBinding: `Device.Mobile`,
|
||||||
|
})
|
||||||
|
bindings.push({
|
||||||
|
type: "context",
|
||||||
|
runtimeBinding: `${safeDevice}.${makePropSafe("tablet")}`,
|
||||||
|
readableBinding: `Device.Tablet`,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return bindings
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets all bindable properties from URL parameters.
|
* Gets all bindable properties from URL parameters.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -35,6 +35,7 @@ const INITIAL_FRONTEND_STATE = {
|
||||||
clientFeatures: {
|
clientFeatures: {
|
||||||
spectrumThemes: false,
|
spectrumThemes: false,
|
||||||
intelligentLoading: false,
|
intelligentLoading: false,
|
||||||
|
deviceAwareness: false,
|
||||||
},
|
},
|
||||||
currentFrontEndType: "none",
|
currentFrontEndType: "none",
|
||||||
selectedScreenId: "",
|
selectedScreenId: "",
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
</section>
|
</section>
|
||||||
{#if filteredColumns?.length}
|
{#if filteredColumns?.length}
|
||||||
<section>
|
<section>
|
||||||
<div class="heading">Columns</div>
|
<div class="heading">Bindable Values</div>
|
||||||
<ul>
|
<ul>
|
||||||
{#each filteredColumns as { readableBinding }}
|
{#each filteredColumns as { readableBinding }}
|
||||||
<li
|
<li
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
import NotificationDisplay from "./NotificationDisplay.svelte"
|
import NotificationDisplay from "./NotificationDisplay.svelte"
|
||||||
import ConfirmationDisplay from "./ConfirmationDisplay.svelte"
|
import ConfirmationDisplay from "./ConfirmationDisplay.svelte"
|
||||||
import PeekScreenDisplay from "./PeekScreenDisplay.svelte"
|
import PeekScreenDisplay from "./PeekScreenDisplay.svelte"
|
||||||
import Provider from "./Provider.svelte"
|
|
||||||
import SDK from "../sdk"
|
import SDK from "../sdk"
|
||||||
import {
|
import {
|
||||||
createContextStore,
|
createContextStore,
|
||||||
|
@ -16,12 +15,13 @@
|
||||||
builderStore,
|
builderStore,
|
||||||
appStore,
|
appStore,
|
||||||
} from "../store"
|
} from "../store"
|
||||||
import { TableNames, ActionTypes } from "../constants"
|
|
||||||
import SettingsBar from "./preview/SettingsBar.svelte"
|
import SettingsBar from "./preview/SettingsBar.svelte"
|
||||||
import SelectionIndicator from "./preview/SelectionIndicator.svelte"
|
import SelectionIndicator from "./preview/SelectionIndicator.svelte"
|
||||||
import HoverIndicator from "./preview/HoverIndicator.svelte"
|
import HoverIndicator from "./preview/HoverIndicator.svelte"
|
||||||
import { Layout, Heading, Body } from "@budibase/bbui"
|
import { Layout, Heading, Body } from "@budibase/bbui"
|
||||||
import ErrorSVG from "../../../builder/assets/error.svg"
|
import ErrorSVG from "../../../builder/assets/error.svg"
|
||||||
|
import UserBindingsProvider from "./UserBindingsProvider.svelte"
|
||||||
|
import DeviceBindingsProvider from "./DeviceBindingsProvider.svelte"
|
||||||
|
|
||||||
// Provide contexts
|
// Provide contexts
|
||||||
setContext("sdk", SDK)
|
setContext("sdk", SDK)
|
||||||
|
@ -41,16 +41,6 @@
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
// Register this as a refreshable datasource so that user changes cause
|
|
||||||
// the user object to be refreshed
|
|
||||||
$: actions = [
|
|
||||||
{
|
|
||||||
type: ActionTypes.RefreshDatasource,
|
|
||||||
callback: () => authStore.actions.fetchUser(),
|
|
||||||
metadata: { dataSource: { type: "table", tableId: TableNames.USERS } },
|
|
||||||
},
|
|
||||||
]
|
|
||||||
|
|
||||||
// Handle no matching route - this is likely a permission error
|
// Handle no matching route - this is likely a permission error
|
||||||
$: {
|
$: {
|
||||||
if (dataLoaded && $routeStore.routerLoaded && !$routeStore.activeRoute) {
|
if (dataLoaded && $routeStore.routerLoaded && !$routeStore.activeRoute) {
|
||||||
|
@ -93,7 +83,8 @@
|
||||||
</Layout>
|
</Layout>
|
||||||
</div>
|
</div>
|
||||||
{:else if $screenStore.activeLayout}
|
{:else if $screenStore.activeLayout}
|
||||||
<Provider key="user" data={$authStore} {actions}>
|
<UserBindingsProvider>
|
||||||
|
<DeviceBindingsProvider>
|
||||||
<div id="app-root" class:preview={$builderStore.inBuilder}>
|
<div id="app-root" class:preview={$builderStore.inBuilder}>
|
||||||
{#key $screenStore.activeLayout._id}
|
{#key $screenStore.activeLayout._id}
|
||||||
<Component instance={$screenStore.activeLayout.props} />
|
<Component instance={$screenStore.activeLayout.props} />
|
||||||
|
@ -116,7 +107,8 @@
|
||||||
<SelectionIndicator />
|
<SelectionIndicator />
|
||||||
<HoverIndicator />
|
<HoverIndicator />
|
||||||
{/if}
|
{/if}
|
||||||
</Provider>
|
</DeviceBindingsProvider>
|
||||||
|
</UserBindingsProvider>
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
<script>
|
||||||
|
import Provider from "./Provider.svelte"
|
||||||
|
import { onMount } from "svelte"
|
||||||
|
|
||||||
|
let width = window.innerWidth
|
||||||
|
const tabletBreakpoint = 768
|
||||||
|
const desktopBreakpoint = 1280
|
||||||
|
const resizeObserver = new ResizeObserver(entries => {
|
||||||
|
if (entries?.[0]) {
|
||||||
|
width = entries[0].contentRect?.width
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
$: data = {
|
||||||
|
mobile: width && width < tabletBreakpoint,
|
||||||
|
tablet: width && width >= tabletBreakpoint && width < desktopBreakpoint,
|
||||||
|
}
|
||||||
|
|
||||||
|
onMount(() => {
|
||||||
|
const doc = document.documentElement
|
||||||
|
resizeObserver.observe(doc)
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
resizeObserver.unobserve(doc)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<Provider key="device" {data}>
|
||||||
|
<slot />
|
||||||
|
</Provider>
|
|
@ -0,0 +1,19 @@
|
||||||
|
<script>
|
||||||
|
import Provider from "./Provider.svelte"
|
||||||
|
import { authStore } from "../store"
|
||||||
|
import { ActionTypes, TableNames } from "../constants"
|
||||||
|
|
||||||
|
// Register this as a refreshable datasource so that user changes cause
|
||||||
|
// the user object to be refreshed
|
||||||
|
$: actions = [
|
||||||
|
{
|
||||||
|
type: ActionTypes.RefreshDatasource,
|
||||||
|
callback: () => authStore.actions.fetchUser(),
|
||||||
|
metadata: { dataSource: { type: "table", tableId: TableNames.USERS } },
|
||||||
|
},
|
||||||
|
]
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<Provider key="user" data={$authStore} {actions}>
|
||||||
|
<slot />
|
||||||
|
</Provider>
|
|
@ -1,7 +1,8 @@
|
||||||
{
|
{
|
||||||
"features": {
|
"features": {
|
||||||
"spectrumThemes": true,
|
"spectrumThemes": true,
|
||||||
"intelligentLoading": true
|
"intelligentLoading": true,
|
||||||
|
"deviceAwareness": true
|
||||||
},
|
},
|
||||||
"layout": {
|
"layout": {
|
||||||
"name": "Layout",
|
"name": "Layout",
|
||||||
|
|
Loading…
Reference in New Issue