some styling changes from code review
This commit is contained in:
parent
d7f70d0424
commit
3c69e48200
|
@ -3,7 +3,7 @@ import { cloneDeep, difference } from "lodash/fp"
|
||||||
/**
|
/**
|
||||||
* parameter for fetchBindableProperties function
|
* parameter for fetchBindableProperties function
|
||||||
* @typedef {Object} fetchBindablePropertiesParameter
|
* @typedef {Object} fetchBindablePropertiesParameter
|
||||||
* @property {string} componentInstanceId - an _id of a component that has been added to a screen, whihc you want to fetch bindable props for
|
* @property {string} componentInstanceId - an _id of a component that has been added to a screen, which you want to fetch bindable props for
|
||||||
* @propperty {Object} screen - current screen - where componentInstanceId lives
|
* @propperty {Object} screen - current screen - where componentInstanceId lives
|
||||||
* @property {Object} components - dictionary of component definitions
|
* @property {Object} components - dictionary of component definitions
|
||||||
* @property {Array} models - array of all models
|
* @property {Array} models - array of all models
|
||||||
|
@ -23,7 +23,7 @@ import { cloneDeep, difference } from "lodash/fp"
|
||||||
* @param {fetchBindablePropertiesParameter} param
|
* @param {fetchBindablePropertiesParameter} param
|
||||||
* @returns {Array.<BindableProperty>}
|
* @returns {Array.<BindableProperty>}
|
||||||
*/
|
*/
|
||||||
export default function ({ componentInstanceId, screen, components, models }) {
|
export default function({ componentInstanceId, screen, components, models }) {
|
||||||
const walkResult = walk({
|
const walkResult = walk({
|
||||||
// cloning so we are free to mutate props (e.g. by adding _contexts)
|
// cloning so we are free to mutate props (e.g. by adding _contexts)
|
||||||
instance: cloneDeep(screen.props),
|
instance: cloneDeep(screen.props),
|
||||||
|
@ -69,16 +69,16 @@ const componentInstanceToBindable = walkResult => i => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const contextToBindables = walkResult => c => {
|
const contextToBindables = walkResult => context => {
|
||||||
const contextParentPath = getParentPath(walkResult, c)
|
const contextParentPath = getParentPath(walkResult, context)
|
||||||
|
|
||||||
return Object.keys(c.model.schema).map(k => ({
|
return Object.keys(context.model.schema).map(k => ({
|
||||||
type: "context",
|
type: "context",
|
||||||
instance: c.instance,
|
instance: context.instance,
|
||||||
// how the binding expression persists, and is used in the app at runtime
|
// how the binding expression persists, and is used in the app at runtime
|
||||||
runtimeBinding: `${contextParentPath}data.${k}`,
|
runtimeBinding: `${contextParentPath}data.${k}`,
|
||||||
// how the binding exressions looks to the user of the builder
|
// how the binding exressions looks to the user of the builder
|
||||||
readableBinding: `${c.instance._instanceName}.${c.model.name}.${k}`,
|
readableBinding: `${context.instance._instanceName}.${context.model.name}.${k}`,
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -120,7 +120,7 @@ const walk = ({ instance, targetId, components, models, result }) => {
|
||||||
// but this will not be correct, as some of
|
// but this will not be correct, as some of
|
||||||
// these components will be in another context
|
// these components will be in another context
|
||||||
// but we dont know this until the end of the walk
|
// but we dont know this until the end of the walk
|
||||||
// so we will filter in another metod
|
// so we will filter in another method
|
||||||
result.bindableInstances.push({
|
result.bindableInstances.push({
|
||||||
instance,
|
instance,
|
||||||
prop: component.bindable,
|
prop: component.bindable,
|
||||||
|
@ -129,7 +129,8 @@ const walk = ({ instance, targetId, components, models, result }) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
// a component that provides context to it's children
|
// a component that provides context to it's children
|
||||||
const contextualInstance = component && component.context && instance[component.context]
|
const contextualInstance =
|
||||||
|
component && component.context && instance[component.context]
|
||||||
|
|
||||||
if (contextualInstance) {
|
if (contextualInstance) {
|
||||||
// add to currentContexts (ancestory of context)
|
// add to currentContexts (ancestory of context)
|
||||||
|
|
|
@ -35,22 +35,26 @@
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
async function replaceBindings(val) {
|
async function replaceBindings(textWithBindings) {
|
||||||
getBindableProperties()
|
getBindableProperties()
|
||||||
// Find all instances of mustasche
|
// Find all instances of mustasche
|
||||||
const boundValues = val.match(/{{([^}]+)}}/g)
|
const CAPTURE_VAR_INSIDE_MUSTACHE = /{{([^}]+)}}/g
|
||||||
|
const boundValues = textWithBindings.match(CAPTURE_VAR_INSIDE_MUSTACHE)
|
||||||
|
|
||||||
// Replace with names:
|
// Replace with names:
|
||||||
boundValues &&
|
boundValues &&
|
||||||
boundValues.forEach(v => {
|
boundValues.forEach(boundValue => {
|
||||||
const binding = bindableProperties.find(({ readableBinding }) => {
|
const binding = bindableProperties.find(({ readableBinding }) => {
|
||||||
return v === `{{ ${readableBinding} }}`
|
return boundValue === `{{ ${readableBinding} }}`
|
||||||
})
|
})
|
||||||
if (binding) {
|
if (binding) {
|
||||||
val = val.replace(v, `{{ ${binding.runtimeBinding} }}`)
|
textWithBindings = textWithBindings.replace(
|
||||||
|
boundValue,
|
||||||
|
`{{ ${binding.runtimeBinding} }}`
|
||||||
|
)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
onChange(key, val)
|
onChange(key, textWithBindings)
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleChange(key, v) {
|
function handleChange(key, v) {
|
||||||
|
|
|
@ -40,7 +40,7 @@ const subscribe = (subscription, storeKey) => {
|
||||||
const contextStore = contextStores[storeKey]
|
const contextStore = contextStores[storeKey]
|
||||||
|
|
||||||
// we are subscribing to multiple stores,
|
// we are subscribing to multiple stores,
|
||||||
// we dont want to each subscription the first time
|
// we dont want to run our listener for every subscription, the first time
|
||||||
// as this could repeatedly run $set on the same component
|
// as this could repeatedly run $set on the same component
|
||||||
// ... which already has its initial properties set properly
|
// ... which already has its initial properties set properly
|
||||||
const ignoreFirstSubscription = () => {
|
const ignoreFirstSubscription = () => {
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue