fix: do not use lazyProperty on necessary methods

nevoland · Feb 4, 2019 · a82ae5a · a82ae5a
1 parent 17c34bc
commit a82ae5a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/src/arrays.js b/src/arrays.js
@@ -8,18 +8,6 @@ import {
   EMPTY_ARRAY,
 } from './tools'
 
-function item(element) {
-  return (index, key = index) => {
-    const { props } = element
-    return {
-      key,
-      value: props.value && props.value[index],
-      name: index,
-      onChange: props.onChange && element.onChangeItem,
-    }
-  }
-}
-
 function onChangeItem(element) {
   return (itemValue, itemIndex, payload) => {
     const { props } = element
@@ -71,6 +59,18 @@ export const array = Component =>
     ))
   */
   class array extends BaseComponent {
+    constructor(props) {
+      super(props)
+      this.item = (index, key = index) => {
+        const { props } = this
+        return {
+          key,
+          value: props.value && props.value[index],
+          name: index,
+          onChange: props.onChange && this.onChangeItem,
+        }
+      }
+    }
     render() {
       const { props } = this
       return $(Component, {
@@ -81,7 +81,7 @@ export const array = Component =>
         onAddItem: props.onChange && lazyProperty(this, 'onAddItem', onAddItem),
         onAddItems:
           props.onChange && lazyProperty(this, 'onAddItems', onAddItems),
-        item: lazyProperty(this, 'item', item),
+        item: this.item,
       })
     }
   }

diff --git a/src/objects.js b/src/objects.js
@@ -4,18 +4,6 @@ import { compose, branch, withHandlers } from 'recompose'
 
 import { hasProp, setProperty, lazyProperty, EMPTY_OBJECT } from './tools'
 
-function property(element) {
-  return (name, key = name) => {
-    const { props } = element
-    return {
-      value: props.value && props.value[name],
-      key,
-      name,
-      onChange: props.onChange && element.onChangeProperty,
-    }
-  }
-}
-
 function onChangeProperty(element) {
   return (propertyValue, propertyName, payload) => {
     const { props } = element
@@ -34,6 +22,18 @@ export const object = Component =>
   Sets `value` to `{}` if not set.
   */
   class object extends BaseComponent {
+    constructor(props) {
+      super(props)
+      this.property = (name, key = name) => {
+        const { props } = this
+        return {
+          value: props.value && props.value[name],
+          key,
+          name,
+          onChange: props.onChange && this.onChangeProperty,
+        }
+      }
+    }
     render() {
       const { props } = this
       return $(Component, {
@@ -42,7 +42,7 @@ export const object = Component =>
         onChangeProperty:
           props.onChange &&
           lazyProperty(this, 'onChangeProperty', onChangeProperty),
-        property: lazyProperty(this, 'property', property),
+        property: this.property,
       })
     }
   }