domql 1.5.21 → 1.5.23

package/package.json

@@ -3,7 +3,7 @@
   "description": "DOM rendering Javascript framework at early stage.",
   "private": false,
   "author": "rackai",
-  "version": "1.5.21",
+  "version": "1.5.23",
   "repository": "https://github.com/rackai/domql",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

package/src/element/create.js

@@ -19,6 +19,14 @@ import { registry } from './mixins'
 
 const ENV = process.env.NODE_ENV
 
+const isComponent = (key) => {
+  const isFirstKeyString = isString(key)
+  if(!isFirstKeyString) return
+
+  const firstCharKey = key.slice(0, 1)
+  return /^[A-Z]*$/.test(firstCharKey)
+}
+
 /**
  * Creating a domQL element using passed parameters
  */
@@ -39,11 +47,19 @@ const create = (element, parent, key, options = {}) => {
   // define KEY
   const assignedKey = element.key || key || createID.next().value
 
-  const firstKeyChar = isString(assignedKey) && assignedKey.slice(0, 1)
-  if (!element.extend && !element.props && /^[A-Z]*$/.test(firstKeyChar)) {
-    element = {
-      extend: assignedKey,
-      props: element
+  const { extend, props, state } = element
+
+  if (isComponent(assignedKey)) {
+    if (!extend && !props && !state) {
+      element = {
+        extend: assignedKey,
+        props: element
+      }
+    } else if (!extend) {
+      element = {
+        extend: assignedKey,
+        ...element
+      }
     }
   }
 

package/src/element/props.js

@@ -15,13 +15,13 @@ const initProps = (element, parent) => {
     return propValue
   }
 
+  if (matchParent && props !== 'match') propsStack.push(matchParent)
+  if (matchParentChild) propsStack.push(matchParentChild)
+
   if (isObject(props)) {
     propsStack.push(props)
   }
 
-  if (matchParent && props !== 'match') propsStack.push(matchParent)
-  if (matchParentChild) propsStack.push(matchParentChild)
-
   if (props === 'inherit') {
     if (parent.props) propsStack.push(parent.props)
   } else if (isMatch) {

package/src/element/update.js

@@ -11,8 +11,6 @@ import { createNode } from '.'
 import { updateProps } from './props'
 import createState from './state'
 
-import { measure } from '@domql/performance'
-
 const UPDATE_DEFAULT_OPTIONS = {
   stackChanges: false,
   cleanExec: true,