react-hook-core 0.5.4 → 0.5.6

package/lib/com.js

@@ -5,10 +5,12 @@ 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("h2", {}, p.title),
     ),
     React.createElement("div", { className: "error-body" }, React.createElement("h4", { className: "h4" }, p.message)),
   )

package/lib/core.js

@@ -4,6 +4,9 @@ exports.pageSizes = [12, 24, 60, 100, 120, 180, 300, 600]
 exports.sizes = exports.pageSizes
 var resources = (function () {
   function resources() {}
+  resources.getSortId = function (field) {
+    return field + "Sort"
+  }
   resources.removePhoneFormat = function (phone) {
     return phone ? phone.replace(resources.phone, "") : ""
   }

package/lib/reflect.js

@@ -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,8 +340,26 @@ function buildSortFilter(obj, sortable) {
   return filter
 }
 exports.buildSortFilter = buildSortFilter
+function getSortId(field) {
+  return core_1.resources.getSortId(field)
+}
+exports.getSortId = getSortId
 function addParametersIntoUrlWithSort(filter, state, isFirstLoad, setFilter) {
   var urlFilter = buildSortFilter(filter, state)
+  if (isFirstLoad) {
+    if (state.sortField) {
+      var eleId = getSortId(state.sortField)
+      var ele = document.getElementById(eleId)
+      if (ele) {
+        if (ele.children.length === 0) {
+          toggleSortStyle(ele)
+          if (state.sortType === "-") {
+            toggleSortStyle(ele)
+          }
+        }
+      }
+    }
+  }
   addParametersIntoUrl(urlFilter, isFirstLoad)
   if (setFilter) {
     setFilter(filter)

package/package.json

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

package/src/com.ts

@@ -9,10 +9,12 @@ export interface ErrorProps {
 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("h2", {}, p.title),
     ),
     React.createElement("div", { className: "error-body" }, React.createElement("h4", { className: "h4" }, p.message)),
   )

package/src/core.ts

@@ -16,6 +16,9 @@ export class resources {
   static pageMaxSize = 7
   static phone = / |\-|\.|\(|\)/g
   static fax = / |\-|\.|\(|\)/g
+  static getSortId(field: string): string {
+    return field + "Sort"
+  }
   static removePhoneFormat(phone?: string | null): string {
     return phone ? phone.replace(resources.phone, "") : ""
   }

package/src/reflect.ts

@@ -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,6 +361,9 @@ export function buildSortFilter<S extends Filter>(obj: S, sortable: Sortable): S
   delete filter.fields
   return filter
 }
+export function getSortId(field: string): string {
+  return resources.getSortId(field)
+}
 export function addParametersIntoUrlWithSort<F extends Filter>(
   filter: F,
   state: Sortable,
@@ -368,6 +371,20 @@ export function addParametersIntoUrlWithSort<F extends Filter>(
   setFilter?: (v: React.SetStateAction<F>) => void,
 ) {
   const urlFilter = buildSortFilter(filter, state)
+  if (isFirstLoad) {
+    if (state.sortField) {
+      const eleId = getSortId(state.sortField)
+      const ele = document.getElementById(eleId)
+      if (ele) {
+        if (ele.children.length === 0) {
+          toggleSortStyle(ele)
+          if (state.sortType === "-") {
+            toggleSortStyle(ele)
+          }
+        }
+      }
+    }
+  }
   addParametersIntoUrl(urlFilter, isFirstLoad)
   if (setFilter) {
     setFilter(filter)