ywana-core8 0.0.717 → 0.0.719

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ywana-core8",
-  "version": "0.0.717",
+  "version": "0.0.719",
   "description": "ywana-core8",
   "homepage": "https://ywana.github.io/workspace",
   "author": "Ernesto Roldan Garcia",

package/src/domain2/CollectionContext.js

@@ -19,9 +19,14 @@ export const CollectionContextProvider = (props) => {
     const [selected, setSelected] = useState(null)
 
     useEffect(() => {
-        console.log("CONTEXT LOAD", filters, customFilters)
+        console.log("CONTEXT LOAD for Filters", filters)
         load()
-    }, [filters, customFilters])
+    }, [filters])
+
+    useEffect(() => {
+        console.log("CONTEXT LOAD for CustomFilters", customFilters)
+        load()
+    }, [customFilters])
 
     async function load() {
 
@@ -52,14 +57,18 @@ export const CollectionContextProvider = (props) => {
         }
     }
 
-    function addCustomFilter(id, filter) {
-        setCustomFilters({ ...customFilters, [id]: filter })
+    async function addCustomFilter(id, filter) {
+        setCustomFilters( prevState => {
+            return { ...prevState, [id]: filter }
+        })
+        return
     }
 
-    function removeCustomFilter(id) {
+    async function removeCustomFilter(id) {
         const next = { ...customFilters }
         delete next[id]
         setCustomFilters(next)
+        return
     }
     
     async function fetch(id) {

package/src/domain2/CollectionPage.test.js

@@ -33,8 +33,8 @@ const CollectionPageTest = (prop) => {
         layout: "ide",
         title: <CustomTitle />,
         canFilter: true,
-        customFilters: [<CustomFilter1 />, <CustomFilter2 />],
-        filtersValue: { name: "333"},
+        customFilters: [<CustomFilters/>,],
+        filtersValue: {},
         listSearchBy: ["name"],
         listGroupBy: "name",
         listItemRenderer,
@@ -71,45 +71,28 @@ const CustomEditor = () => {
     )
 }
 
-const CustomFilter1 = (props) => {
-
-    const context = useContext(CollectionContext)
-    const [active, setActive] = useState(false)
-
-    useEffect(() => {
-        if (active) {
-            context.addCustomFilter("custom1", filter)
-        } else {
-            context.removeCustomFilter("custom1")
-        }
-    }, [active])
-
-    function change(id, value) {
-        setActive(value)
-    }
-
-    function filter(all) {
-        return all.filter(item => {
-            return item.name.startsWith("1")
-        })
-    }
 
+const CustomFilters = (props) => {
+    
     return (
-        <CheckBox id="custom1" value={active} label="Active" onChange={change} />
+        <>
+            <CustomFilter1 id="customfilter1" label="1"/>
+            <CustomFilter1 id="customfilter2" label="2"/>
+        </>
     )
 }
 
-const CustomFilter2 = (props) => {
+const CustomFilter1 = (props) => {
 
-    const { value = false } = props
+    const { id, label}    = props
     const context = useContext(CollectionContext)
-    const [active, setActive] = useState(value)
+    const [active, setActive] = useState(true)
 
-    useEffect(() => {
+    useEffect(async () => {
         if (active) {
-            context.addCustomFilter("custom2", filter)
+            await context.addCustomFilter(id, filter)
         } else {
-            context.removeCustomFilter("custom2")
+            await context.removeCustomFilter(id)
         }
     }, [active])
 
@@ -119,11 +102,11 @@ const CustomFilter2 = (props) => {
 
     function filter(all) {
         return all.filter(item => {
-            return item.name.endsWith("1")
+            return item.name.startsWith("1")
         })
     }
 
     return (
-        <CheckBox id="custom1" value={active} label="Locked" onChange={change} />
+        <CheckBox id={id} value={active} label={label} onChange={change} />
     )
-}
+}

package/src/incubator/wizard.js

@@ -50,7 +50,7 @@ export const Wizard = (props) => {
         })
     }
 
-    const currentStep = React.cloneElement(steps[current], { ref: stepRef, onChange: validate })
+    const currentStep = React.cloneElement(steps[current], { ref: stepRef, onChange: validate, next: next })
     const nextButton = current < steps.length - 1 ? <Button label="Siguiente" action={next} raised disabled={!valid}/> : <Button label="Finish" action={finish} disabled={!valid}/>
     const prevButton = current > 0 ? <Button label="Atrás" action={prev} /> : null
 

package/src/incubator/wizard.test.js

@@ -7,12 +7,16 @@ export const Step1 = forwardRef((props, ref) => {
 
     const wizardContext = React.useContext(WizardContext)
     const { form } = wizardContext
-    const { onChange } = props
+    const { next, onChange } = props
     
     useEffect(() => {
         onChange(form, isValid(form)) 
     }, [form])
     
+    useEffect(() => {
+        if (form.name && form.name === "ok" && next) next()
+    }, [form])
+
     function changeForm(id, value) {
         wizardContext.setForm({ ...form, [id]: value })
     }