hyperapp-is 0.1.10 → 0.1.12

package/README.md

@@ -532,15 +532,17 @@ getEntriesの返す値
 
 ```ts
 export interface JsonEntry <D> {
-	name  : string
-	data  : D
-	isNode: boolean
+	name      : string
+	data      : D
+	isNode    : boolean
+	extension?: Record<string, any>
 }
 ```
 
 - name      : 名前
 - data      : データ
 - isNode    : ディレクトリか
+- extension?: `NavigatorItem.extension` に追加する値
 
 ---
 
@@ -576,7 +578,6 @@ export const convertJsonToNavigatorItem = function <D> (
 		getEntries : (data: D, depth: number) => JsonEntry<D>[]
 		isNode     : boolean
 		depth     ?: number
-		extension ?: (item: NavigatorItem, data: D, depth: number) => Record<string, any> | undefined
 	}
 ): NavigatorItem
 ```
@@ -587,7 +588,6 @@ export const convertJsonToNavigatorItem = function <D> (
 - getEntries: JsonEntry配列を返す関数
 - isNode    : ディレクトリか
 - depth     : 階層の深さ
-- extension : 拡張オブジェクトを作成する関数
 
 ---
 

package/dist/hyperapp-is/core/navigator.d.ts

@@ -12,10 +12,12 @@ export interface JsonEntry<D> {
     name: string;
     data: D;
     isNode: boolean;
+    extension?: Record<string, any>;
 }
 export interface NavigatorColumn {
     name: string;
     val: (item: NavigatorItem) => any;
+    text?: (item: NavigatorItem) => string;
     compare?: (a: NavigatorItem, b: NavigatorItem) => number;
 }
 export declare const convertJsonToNavigatorItem: <D>(props: {
@@ -25,7 +27,6 @@ export declare const convertJsonToNavigatorItem: <D>(props: {
     getEntries: (data: D, depth: number) => JsonEntry<D>[];
     isNode: boolean;
     depth?: number;
-    extension?: (item: NavigatorItem, data: D, depth: number) => Record<string, any> | undefined;
 }) => NavigatorItem;
 export declare const getParentItems: (item: NavigatorItem | undefined) => NavigatorItem[];
 /**

package/dist/hyperapp-is/core/navigator.js

@@ -5,25 +5,24 @@ import { el, deleteKeys, SelectButton } from "./component";
 // convertJsonToNavigatorItem
 // ---------- ---------- ---------- ---------- ----------
 export const convertJsonToNavigatorItem = function (props) {
-    const { parent, name, data, getEntries, isNode, depth = 0, extension } = props;
+    const { parent, name, data, getEntries, isNode, depth = 0 } = props;
     const result = {
         parent,
         name,
         path: parent ? parent.path + "/" + name : "/" + name
     };
-    if (extension) {
-        const ext = extension(result, data, depth);
-        if (ext)
-            result.extension = ext;
-    }
-    const properties = {};
-    let hasProperty = false;
+    let extension;
+    let properties;
     const children = [];
     getEntries(data, depth).forEach(entry => {
+        if (entry.extension) {
+            extension !== null && extension !== void 0 ? extension : (extension = {});
+            Object.assign(extension, entry.extension);
+        }
         const isProperty = typeof entry.data !== "object" || Array.isArray(entry.data);
         if (isProperty) {
+            properties !== null && properties !== void 0 ? properties : (properties = {});
             properties[entry.name] = entry.data;
-            hasProperty = true;
         }
         else {
             children.push(convertJsonToNavigatorItem({
@@ -32,12 +31,13 @@ export const convertJsonToNavigatorItem = function (props) {
                 data: entry.data,
                 getEntries,
                 isNode: entry.isNode,
-                depth: depth + 1,
-                extension
+                depth: depth + 1
             }));
         }
     });
-    if (hasProperty)
+    if (extension)
+        result.extension = extension;
+    if (properties)
         result.properties = properties;
     if (isNode)
         result.children = children;
@@ -179,7 +179,7 @@ export const NavigatorFinder = function (props) {
         // filter
         const result = isFilter && searchText !== ""
             ? item.children.filter(child => {
-                return columns.some(col => hitTest(col.val(child)));
+                return columns.some(col => hitTest(col.text ? col.text(child) : col.val(child)));
             })
             : item.children;
         // maxCount
@@ -203,7 +203,7 @@ export const NavigatorFinder = function (props) {
     // items hitCount
     const hitCount = isFilter
         ? items.length
-        : items.filter(item => columns.some(col => hitTest(col.val(item)))).length;
+        : items.filter(item => columns.some(col => hitTest(col.text ? col.text(item) : col.val(item)))).length;
     // ---------- ---------- ----------
     // action_parentClick
     // ---------- ---------- ----------
@@ -297,10 +297,11 @@ export const NavigatorFinder = function (props) {
             : [action_itemClick, item]
     }, columns.map(col => {
         const v = col.val(item);
+        const t = col.text ? col.text(item) : typeof v === "string" ? v : "";
         return td({
-            title: String(v)
+            title: t
         }, span({
-            class: typeof v === "string" && hitTest(v) ? "hit" : ""
+            class: hitTest(t) ? "hit" : ""
         }, v));
     }))))), 
     // statusBar

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hyperapp-is",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "UI foundation library for Hyperapp by is4416",
   "license": "MIT",
   "type": "module",