Merge branch 'master' into feat/add-required

cli.js

@@ -51,6 +51,7 @@ let wait = time => new Promise(resolve => setTimeout(resolve, time))
     --as            target platform
                       react-dom (default)
                       react-native
+                      react-pdf
     --clean         clean the autogenerated .view.js files
     --local         default local language, defaults to English (en)
     --tools         use with Views Tools, defauls to true when

ensure-flow.js

@@ -8,7 +8,7 @@ function ensureFirstStoryIsOn(flow, key, stories) {
   if (!stories.has(key)) return
 
   let story = flow.get(key)
-  if (story.stories.size > 0) {
+  if (story && story.stories.size > 0) {
     let index = 0
     for (let id of story.stories) {
       if (index === 0 || !story.isSeparate) {

fonts.js

@@ -9,6 +9,7 @@ import relativise from './relativise.js'
 let morphFont = {
   'react-dom': morphFontAsReactDom,
   'react-native': morphFontAsReactNative,
+  'react-pdf': morphFontAsReactNative,
 }
 
 export async function ensureFontsDirectory(src) {

morph/react-dom/get-value-for-property.js

@@ -65,9 +65,7 @@ export default (node, parent, state) => {
       node.value === 'props.isValid')
   ) {
     return {
-      [node.name]: `{${node.value.replace('props.', 'data.')} || ${
-        node.value
-      }}`,
+      [node.name]: `{${node.value.replace('props.', 'data.')}}`,
     }
   } else if (isValidImgSrc(node, parent)) {
     return {

morph/react-native.js

@@ -23,6 +23,7 @@ export default ({
   getSystemImport,
   local,
   localSupported,
+  reactNativeLibraryImport = 'react-native',
   track,
   view,
   viewsById,
@@ -75,6 +76,7 @@ export default ({
     testIdKey: 'testID',
     testIds: {},
     track,
+    reactNativeLibraryImport,
     usedBlockNames: { [finalName]: 1, AutoSizer: 1, Column: 1, Table: 1 },
     uses: [],
     use(block, isLazy = false) {

morph/react-native/get-value-for-property.js

@@ -65,9 +65,7 @@ export default (node, parent, state) => {
       node.value === 'props.isInvalid')
   ) {
     return {
-      [node.name]: `{${node.value.replace('props.', 'data.')} || ${
-        node.value
-      }}`,
+      [node.name]: `{${node.value.replace('props.', 'data.')}}`,
     }
   } else if (isValidImgSrc(node, parent)) {
     return (

morph/react-pdf.js

@@ -0,0 +1,7 @@
+import reactNativeMorph from './react-native.js'
+
+export default options =>
+  reactNativeMorph({
+    ...options,
+    reactNativeLibraryImport: '@react-pdf/renderer',
+  })

morph/react/block-off-when.js

@@ -12,10 +12,9 @@ export function enter(node, parent, state) {
     if (parent && !isList(parent)) state.render.push('{')
     let value = onWhen.value
     if (state.data && value === 'props.isInvalid') {
-      value = 'data.isInvalid || props.isInvalid'
-    }
-    if (state.data && value === 'props.isValid') {
-      value = 'data.isValid || props.isValid'
+      value = 'data.isInvalid'
+    } else if (state.data && value === 'props.isValid') {
+      value = 'data.isValid'
     }
     state.render.push(`${value} ? `)
   } else if (isStory(node, state)) {

morph/react/get-dependencies.js

@@ -126,7 +126,11 @@ export default (state, getImport) => {
   }
 
   if (usesNative.length > 0) {
-    dependencies.push(`import { ${usesNative.join(', ')} } from 'react-native'`)
+    dependencies.push(
+      `import { ${usesNative.join(', ')} } from '${
+        state.reactNativeLibraryImport
+      }'`
+    )
   }
 
   if (state.track) {

morph/react/property-text.js

@@ -26,7 +26,9 @@ let parseFormatValue = (value, type) => {
 
 export function enter(node, parent, state) {
   if (node.name === 'text' && parent.name === 'Text') {
-    if (hasCustomScopes(node, parent)) {
+    if (state.data && node.value === 'props.value') {
+      parent.explicitChildren = '{data.value}'
+    } else if (hasCustomScopes(node, parent)) {
       parent.explicitChildren = wrap(getScopedCondition(node, parent))
     } else if (isSlot(node)) {
       parent.explicitChildren = wrap(node.value)

morphers.js

@@ -1,7 +1,9 @@
 import reactDom from './morph/react-dom.js'
 import reactNative from './morph/react-native.js'
+import reactPdf from './morph/react-pdf.js'
 
 export default {
   'react-dom': reactDom,
   'react-native': reactNative,
+  'react-pdf': reactPdf,
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewstools/morph",
-  "version": "19.7.2",
+  "version": "19.9.0",
   "description": "Views language morpher",
   "main": "index.js",
   "type": "module",