@arc-fusion/components - npm Package Compare versions

Comparing version 3.0.0-beta.5 to 3.0.0-beta.6

package.json

 {
   "name": "@arc-fusion/components",
-  "version": "3.0.0-beta.5",
+  "version": "3.0.0-beta.6",
   "description": "",
@@ -5,0 +5,0 @@ "main": "src/components/index.js",

src/components/content.js

@@ -21,3 +21,3 @@ 'use strict'
 
-  if (isClient) {
+  if (isClient && fetched) {
     fetched.then(setContent)
@@ -24,0 +24,0 @@ }

src/components/context.js

@@ -14,3 +14,3 @@ 'use strict'
 function useAppContext () {
-  const appContext = React.useContext(AppContext)
+  const { staticElements, ...appContext } = React.useContext(AppContext)
   const { globalContent } = useComponentContext()
@@ -17,0 +17,0 @@

src/components/index.js

@@ -6,4 +6,7 @@ 'use strict'
   Comment: require('./comment'),
+  Consumer: require('./consumer'),
   Content: require('./content'),
-  Context: require('./context')
+  Context: require('./context'),
+  Layout: require('./layout'),
+  Static: require('./static')
 }

src/components/quarantine.js

@@ -7,3 +7,3 @@ 'use strict'
 
-const { isClient, getComponentName } = require('../utils')
+const { getComponentName, isServer } = require('../utils')
 
@@ -23,34 +23,41 @@ // this extracts an already-wrapped component name
 const Quarantine =
-  (ErrorComponent) => (isClient)
-    ? (Component, name) => {
-      name = name || getName(Component)
+  (ErrorComponent) =>
+    (isServer)
+      ? (Component) => Component
+      : (Component, name) => {
+        name = name || getName(Component)
 
-      class Quarantine extends React.Component {
-        constructor (props) {
-          super(props)
+        class Quarantine extends React.Component {
+          constructor (props) {
+            super(props)
 
-          this.state = {
-            error: null
+            this.state = {
+              error: null
+            }
           }
-        }
 
-        componentDidCatch (error, info) {
-          console.error(error, info)
-          this.setState({ error })
-        }
+          componentDidCatch (error, info) {
+            console.error(error, info)
+            this.setState({ error })
+          }
 
-        render () {
-          return (this.state.error)
-            ? React.createElement(ErrorComponent || DefaultErrorComponent, { error: this.state.error, name })
-            : React.createElement(Component, this.props)
+          render () {
+            const props = (Component === React.Fragment)
+              ? {
+                key: this.props.key,
+                children: this.props.children
+              }
+              : this.props
+            return (this.state.error)
+              ? React.createElement(ErrorComponent, { error: this.state.error, name })
+              : React.createElement(Component, props)
+          }
         }
-      }
 
-      Quarantine.displayName = `Quarantine(${name})`
+        Quarantine.displayName = `Quarantine(${name})`
 
-      return Quarantine
-    }
-    : (Component) => Component
+        return Quarantine
+      }
 
 module.exports = Quarantine(DefaultErrorComponent)
 module.exports.Quarantine = Quarantine

src/components/tree.js

@@ -5,2 +5,3 @@ 'use strict'
 
+const Layout = require('./layout')
 const Quarantine = require('./quarantine')
@@ -51,3 +52,6 @@
         const Component = getComponent(node)
-        collectionCache[type] = Component && Quarantine(Component)
+        const Wrapper = (collection === 'layouts')
+          ? Layout
+          : Quarantine
+        collectionCache[type] = Component && Wrapper(Component)
       }
@@ -74,3 +78,3 @@ return collectionCache[type]
     const id = node.fingerprint || node.id || node._id
-    const key = node.key || id
+    const key = node.key || id || index
 
@@ -102,3 +106,5 @@ const getComponentContent = (localEdits)
         Component,
-        node.props || {},
+        (Component === React.Fragment)
+          ? { key }
+          : node.props || {},
         (children instanceof Object)
@@ -105,0 +111,0 @@ ? [].concat(children).map(createElement)

src/contexts.js

@@ -10,3 +10,6 @@ 'use strict'
   renderables: null,
-  tree: null
+  tree: null,
+
+  /* hidden from users */
+  staticElements: {}
 })
@@ -20,4 +23,5 @@ AppContext.displayName = 'AppContext'
   globalContent: {},
-  // localEdits: null,
-  getContent: () => {}
+
+  /* hidden from users */
+  getContent: () => ({})
 })
@@ -24,0 +28,0 @@ ComponentContext.displayName = 'ComponentContext'

src/utils.js

@@ -9,2 +9,3 @@ 'use strict'
 const isClient = typeof window !== 'undefined'
+const isServer = !isClient
 const isFusion = typeof Fusion !== 'undefined'
@@ -23,3 +24,4 @@ const isFunction = (Component) => (Component instanceof Function)
   isClient,
-  isFunction
+  isFunction,
+  isServer
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

27930

increased by21.79%

Number of package files

28

increased by16.67%

Lines of code

974

increased by24.71%

No dependency changes