ywana-core8 0.0.567 → 0.0.570

package/package.json

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

package/src/domain/CollectionPage.js

@@ -29,7 +29,7 @@ export const CollectionPage = (props) => {
 
     const [pageContext, setPageContext] = useContext(PageContext)
     const context = CollectionContext(url, field, host, page, fetching)
-    const [showFilter, setShowFilter] = useState(true)
+    const [showFilter, setShowFilter] = useState(false)
 
     useEffect(async () => {
         await context.load()
@@ -371,8 +371,13 @@ export const CollectionContext = (url, field, host, page, fetching) => {
     return {
 
         all: [],
+        filters: {},
         selected: null,
 
+        changeFilters(filters) {
+            this.filters = filters
+        },
+        
         async load() {
             try {
                 const data = await API.all(null, page);

package/src/html/textfield.js

@@ -150,12 +150,13 @@ export const DropDown = (props) => {
         if (!readOnly) setOpen(!open)
     }
 
-    function select(event) {
-        const next = event.target.getAttribute("value")
+    function select(value) {
+        const next = value
         const option = options.find(option => option.value === next)
         setOpen(false)
         const label = verbose ? option.label : ""
         setLabel(label)
+        console.log("dd.select", value)
         if (onChange) onChange(id, next)
     }
 
@@ -168,8 +169,8 @@ export const DropDown = (props) => {
         if (canShow) {
             const filterActive = predictive === true && label && label.length > 0
             const items = filterActive ? options.filter(option => option.label.toUpperCase().indexOf(label.toUpperCase()) >= 0) : options
-            const lis = items.map(option => <li key={option.value} value={option.value}><Text>{option.label}</Text></li>)
-            return <menu><ul onMouseDown={select}>{lis}</ul></menu>
+            const lis = items.map(option => <li key={option.value} value={option.value} onClick={() => select(option.value)}><Text>{option.label}</Text></li>)
+            return <menu><ul>{lis}</ul></menu>
         } else {
             return null
         }

package/src/html/textfield.test.js

@@ -30,6 +30,7 @@ const TextFieldTest = (prop) => {
         <>
             <DropDown id="b1" label="Boolean1" onChange={change} options={options2} value={form.b1} />
             <TokenField id="token1" label="Tokens" onChange={change} />
+            <TokenField id="token2" label="Tokens DropDown" onChange={change} options={options} tokens={form.token2}/>
             <TextField id="name" label="Name" value={form.name} onChange={change} />
             <DropDown id="gender1" label="Dropdown 1" value={form.gender1} onChange={change} options={options} predictive={false}/>
             <DropDown id="gender2" label="Dropdown 2" value={form.gender2} onChange={change} options={options} predictive={true}/>

package/src/html/tokenfield.js

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from 'react'
+import React, { useState } from 'react'
 import { Icon } from './icon';
 import { Text } from './text';
 import { DropDown } from './textfield';
@@ -24,6 +24,7 @@ export const TokenField = ({ id, label, tokens = [], readOnly, options, onChange
 
   function changeDropDown(fid, value) {
     const next = Array.isArray(tokens) ? tokens.concat(value) : [value]
+    console.log("next", next)
     if (onChange) onChange(id, next)
     setValue('')
   }
@@ -33,9 +34,11 @@ export const TokenField = ({ id, label, tokens = [], readOnly, options, onChange
       event.preventDefault()
       event.stopPropagation()
       const token = event.target.value
-      const next = Array.isArray(tokens) ? tokens.concat(token) : [token]
-      if (onChange) onChange(id, next)
-      setValue('')
+      if (token && token.length > 0) {
+        const next = Array.isArray(tokens) ? tokens.concat(token) : [token]
+        if (onChange) onChange(id, next)
+        setValue('')
+      }
     }
 
     if (value === '' && tokens.length > 0 && event.key === 'Backspace') {
@@ -45,7 +48,7 @@ export const TokenField = ({ id, label, tokens = [], readOnly, options, onChange
   }
 
   const tks = Array.isArray(tokens) ? tokens : []
-
+  console.log("render", tks)
   return (
     <div className='tokenField'>
       <label>{label}</label>

package/src/widgets/planner/Planner.js

@@ -93,13 +93,13 @@ export const Planner = ({ title, events = [], lanes = [], navigation = true, onS
             {navigation ? (
                 <Header title={label}>
                     &nbsp;&nbsp;
-                    <Button label="This Week" outlined action={showThisWeek}/>
+                    <Button label="Esta Semana" outlined action={showThisWeek}/>
                     <Icon icon="chevron_right" clickable action={next} />
-                    <TextField id="to" type="date" label="To" value={to} onChange={(id, value) => setTo(value)} />
+                    <TextField id="to" type="date" label="Hasta" value={to} onChange={(id, value) => setTo(value)} />
                     <div className="expand"></div>
-                    <DropDown id="ranges" label="Date Range" options={DATE_RANGE} value={dateRange} onChange={(id, value) => setDateRange(value)} />
+                    <DropDown id="ranges" label="Rango" options={DATE_RANGE} value={dateRange} onChange={(id, value) => setDateRange(value)} />
                     <div className="expand"></div>
-                    <TextField id="from" type="date" label="From" value={from} onChange={(id, value) => setFrom(value)} />
+                    <TextField id="from" type="date" label="Desde" value={from} onChange={(id, value) => setFrom(value)} />
                     <Icon icon="chevron_left" clickable action={prev} />
                 </Header>
             ) : null}