react-hook-core 0.5.3 → 0.5.5

package/lib/com.js

@@ -2,6 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true })
 var React = require("react")
 var core_1 = require("./core")
+function Error(p) {
+  return React.createElement(
+    "div",
+    {},
+    React.createElement(
+      "header",
+      {},
+      p.back && React.createElement("button", { type: "button", id: "btnBack", name: "btnBack", className: "btn-back", onClick: p.back }),
+      React.createElement("h2", {}, p.title),
+    ),
+    React.createElement("div", { className: "error-body" }, React.createElement("h4", { className: "h4" }, p.message)),
+  )
+}
+exports.Error = Error
 function PageSizeSelect(p) {
   var g = p.sizes
   var s = !g || g.length === 0 ? core_1.pageSizes : g
@@ -28,9 +42,10 @@ function Search(p) {
         maxLength: p.maxLength,
         placeholder: p.placeholder,
       }),
-      p.clear && React.createElement("button", { type: "button", hidden: !p.value, className: "btn-remove-text", onClick: p.clear }),
-      p.toggle && React.createElement("button", { type: "button", className: "btn-filter", onClick: p.toggle }),
-      p.search && React.createElement("button", { type: "submit", className: "btn-search", onClick: p.search }),
+      p.clear &&
+        React.createElement("button", { type: "button", id: "btnClearQ", name: "btnClearQ", hidden: !p.value, className: "btn-remove-text", onClick: p.clear }),
+      p.toggle && React.createElement("button", { type: "button", id: "btnToggleSearch", name: "btnToggleSearch", className: "btn-filter", onClick: p.toggle }),
+      p.search && React.createElement("button", { type: "submit", id: "btnSearch", name: "btnSearch", className: "btn-search", onClick: p.search }),
     ),
   )
 }

package/lib/reflect.js

@@ -42,11 +42,11 @@ function clone(obj) {
 exports.clone = clone
 function diff(obj1, obj2) {
   var fields = []
-  var key1s = Object.keys(obj1)
+  var key1s = Object.keys(obj2)
   for (var _i = 0, key1s_1 = key1s; _i < key1s_1.length; _i++) {
     var k = key1s_1[_i]
-    var v1 = obj1[k]
-    var v2 = obj2[k]
+    var v1 = obj2[k]
+    var v2 = obj1[k]
     if (v1 == null) {
       if (v2 != null) {
         fields.push(k)
@@ -64,7 +64,7 @@ function diff(obj1, obj2) {
       }
     }
   }
-  var key2s = Object.keys(obj2)
+  var key2s = Object.keys(obj1)
   var ni = notIn(key1s, key2s)
   for (var _a = 0, ni_1 = ni; _a < ni_1.length; _a++) {
     var n = ni_1[_a]
@@ -88,6 +88,7 @@ function makeDiff(o1, o2, keys, version) {
   if (o1 && !o2) {
     return o1
   }
+  debugger
   var obj1 = o1
   var obj2 = o2
   var obj3 = {}
@@ -97,18 +98,18 @@ function makeDiff(o1, o2, keys, version) {
   }
   for (var _i = 0, s_1 = s; _i < s_1.length; _i++) {
     var d = s_1[_i]
-    obj3[d] = obj2[d]
+    obj3[d] = obj1[d]
   }
   if (keys && keys.length > 0) {
     for (var _a = 0, keys_2 = keys; _a < keys_2.length; _a++) {
       var x = keys_2[_a]
       if (x.length > 0) {
-        obj3[x] = obj1[x]
+        obj3[x] = obj2[x]
       }
     }
   }
   if (version && version.length > 0) {
-    obj3[version] = obj1[version]
+    obj3[version] = obj2[version]
   }
   return obj3
 }

package/lib/search.js

@@ -340,9 +340,12 @@ function buildSortFilter(obj, sortable) {
   return filter
 }
 exports.buildSortFilter = buildSortFilter
-function addParametersIntoUrlWithSort(filter, state, isFirstLoad) {
+function addParametersIntoUrlWithSort(filter, state, isFirstLoad, setFilter) {
   var urlFilter = buildSortFilter(filter, state)
   addParametersIntoUrl(urlFilter, isFirstLoad)
+  if (setFilter) {
+    setFilter(filter)
+  }
 }
 exports.addParametersIntoUrlWithSort = addParametersIntoUrlWithSort
 function handleToggle(target, off) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-hook-core",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "react",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/com.ts

@@ -1,6 +1,35 @@
 import * as React from "react"
 import { Locale, pageSizes } from "./core"
 
+export interface ErrorProps {
+  title?: string
+  message?: string
+  back?: React.MouseEventHandler<HTMLElement>
+}
+export function Error(p: ErrorProps) {
+  return React.createElement(
+    "div",
+    {},
+    React.createElement(
+      "header",
+      {},
+      p.back && React.createElement("button", { type: "button", id: "btnBack", name: "btnBack", className: "btn-back", onClick: p.back }),
+      React.createElement("h2", {}, p.title),
+    ),
+    React.createElement("div", { className: "error-body" }, React.createElement("h4", { className: "h4" }, p.message)),
+  )
+  /*
+  <div>
+    <header>
+      <button type="button" id="btnBack" name="btnBack" className="btn-back" onClick={() => navigate(-1)}></button>
+      <h2>{resource.error_404_title}</h2>
+    </header>
+    <div className="error-body">
+      <h4 className="h4">{resource.error_404_message}</h4>
+    </div>
+  </div>
+  */
+}
 export interface PageSizeProps {
   id?: string
   name?: string
@@ -46,9 +75,10 @@ export function Search(p: Props) {
         maxLength: p.maxLength,
         placeholder: p.placeholder,
       }),
-      p.clear && React.createElement("button", { type: "button", hidden: !p.value, className: "btn-remove-text", onClick: p.clear }),
-      p.toggle && React.createElement("button", { type: "button", className: "btn-filter", onClick: p.toggle }),
-      p.search && React.createElement("button", { type: "submit", className: "btn-search", onClick: p.search }),
+      p.clear &&
+        React.createElement("button", { type: "button", id: "btnClearQ", name: "btnClearQ", hidden: !p.value, className: "btn-remove-text", onClick: p.clear }),
+      p.toggle && React.createElement("button", { type: "button", id: "btnToggleSearch", name: "btnToggleSearch", className: "btn-filter", onClick: p.toggle }),
+      p.search && React.createElement("button", { type: "submit", id: "btnSearch", name: "btnSearch", className: "btn-search", onClick: p.search }),
     ),
   )
   /*
@@ -57,9 +87,9 @@ export function Search(p: Props) {
       <label className={p.className}>
         {p.pageSizeChanged && <PageSizeSelect size={p.size} sizes={p.sizes} onChange={p.pageSizeChanged} name={p.name} id={p.id} />}
         <input type='text' id='q' name='q' value={p.value || ''} onChange={p.onChange} maxLength={p.maxLength} placeholder={p.placeholder} />
-        {p.clear && <button type='button' hidden={!p.value} className='btn-remove-text' onClick={p.clear}/>}
-        {p.toggle && <button type='button' className='btn-filter' onClick={p.toggle} />}
-        {p.search && <button type='submit' className='btn-search' onClick={p.search} />}
+        {p.clear && <button type='button' id='btnClearQ' name='btnClearQ' hidden={!p.value} className='btn-remove-text' onClick={p.clear}/>}
+        {p.toggle && <button type='button' id='btnToggleSearch' name='btnToggleSearch' className='btn-filter' onClick={p.toggle} />}
+        {p.search && <button type='submit' id='btnSearch' name='btnSearch' className='btn-search' onClick={p.search} />}
       </label>
     </>
   );

package/src/reflect.ts

@@ -38,10 +38,10 @@ export function clone(obj: any): any {
 
 export function diff(obj1: any, obj2: any): string[] {
   const fields = []
-  const key1s = Object.keys(obj1)
+  const key1s = Object.keys(obj2)
   for (const k of key1s) {
-    const v1 = obj1[k]
-    const v2 = obj2[k]
+    const v1 = obj2[k]
+    const v2 = obj1[k]
     if (v1 == null) {
       if (v2 != null) {
         fields.push(k)
@@ -59,7 +59,7 @@ export function diff(obj1: any, obj2: any): string[] {
       }
     }
   }
-  const key2s = Object.keys(obj2)
+  const key2s = Object.keys(obj1)
   const ni = notIn(key1s, key2s)
   for (const n of ni) {
     fields.push(n)
@@ -80,6 +80,7 @@ export function makeDiff<T>(o1: T, o2?: T, keys?: string[], version?: string): P
   if (o1 && !o2) {
     return o1
   }
+  debugger
   const obj1: any = o1
   const obj2: any = o2
   const obj3: any = {}
@@ -88,17 +89,17 @@ export function makeDiff<T>(o1: T, o2?: T, keys?: string[], version?: string): P
     return obj3
   }
   for (const d of s) {
-    obj3[d] = obj2[d]
+    obj3[d] = obj1[d]
   }
   if (keys && keys.length > 0) {
     for (const x of keys) {
       if (x.length > 0) {
-        obj3[x] = obj1[x]
+        obj3[x] = obj2[x]
       }
     }
   }
   if (version && version.length > 0) {
-    obj3[version] = obj1[version]
+    obj3[version] = obj2[version]
   }
   return obj3
 }

package/src/search.ts

@@ -361,9 +361,17 @@ export function buildSortFilter<S extends Filter>(obj: S, sortable: Sortable): S
   delete filter.fields
   return filter
 }
-export function addParametersIntoUrlWithSort<F extends Filter>(filter: F, state: Sortable, isFirstLoad?: boolean) {
+export function addParametersIntoUrlWithSort<F extends Filter>(
+  filter: F,
+  state: Sortable,
+  isFirstLoad?: boolean,
+  setFilter?: (v: React.SetStateAction<F>) => void,
+) {
   const urlFilter = buildSortFilter(filter, state)
   addParametersIntoUrl(urlFilter, isFirstLoad)
+  if (setFilter) {
+    setFilter(filter)
+  }
 }
 export function handleToggle(target?: HTMLElement, off?: boolean): boolean {
   const on = !off