react-hook-core 0.4.19 → 0.4.21

package/lib/route.js

@@ -1,6 +1,6 @@
 "use strict"
 Object.defineProperty(exports, "__esModule", { value: true })
-var qs = require("query-string")
+var query_string_1 = require("query-string")
 var reflect_1 = require("./reflect")
 function goBack(navigate, confirm, resource, o1, o2, keys, version) {
   if (!reflect_1.hasDiff(o1, o2, keys, version)) {
@@ -23,7 +23,7 @@ function buildParameters(url, model) {
     urlSearch = url.substring(i + 1)
   }
   try {
-    var parsed = convertToObject(qs.parse(urlSearch), model)
+    var parsed = convertToObject(query_string_1.default.parse(urlSearch), model)
     return parsed
   } catch (error) {
     console.log(error)

package/lib/state.js

@@ -16,6 +16,92 @@ var __assign =
 Object.defineProperty(exports, "__esModule", { value: true })
 var reflect_1 = require("./reflect")
 var util_1 = require("./util")
+function getDecimalSeparator(ele) {
+  var separator = ele.getAttribute("data-decimal-separator")
+  if (!separator) {
+    var form = ele.form
+    if (form) {
+      separator = form.getAttribute("data-decimal-separator")
+    }
+  }
+  return separator === "," ? "," : "."
+}
+exports.getDecimalSeparator = getDecimalSeparator
+var r1 = / |,|\$|€|£|¥|'|٬|،| /g
+var r2 = / |\.|\$|€|£|¥|'|٬|،| /g
+function updateState(e, o, setObj) {
+  var ctrl = e.target
+  var dataField = ctrl.getAttribute("data-field")
+  var field = dataField ? dataField : ctrl.name
+  if (ctrl.tagName === "SELECT") {
+    if (ctrl.tagName === "SELECT") {
+      if (ctrl.value === "" || !ctrl.value) {
+        ctrl.removeAttribute("data-value")
+      } else {
+        ctrl.setAttribute("data-value", "data-value")
+      }
+    }
+    reflect_1.setValue(o, field, ctrl.value)
+  } else {
+    var stype = ctrl.getAttribute("type")
+    var type = stype ? stype.toLowerCase() : "text"
+    var model = o
+    if (type === "text") {
+      var datatype = ctrl.getAttribute("data-type")
+      if (datatype === "number" || datatype === "integer") {
+        var decimalSeparator = getDecimalSeparator(ctrl)
+        var v0 = ctrl.value
+        var v = decimalSeparator === "," ? v0.replace(r2, "") : v0.replace(r1, "")
+        var val = isNaN(v) ? undefined : parseFloat(v)
+        reflect_1.setValue(o, field, val)
+      } else {
+        reflect_1.setValue(o, field, ctrl.value)
+      }
+    } else if (type === "checkbox") {
+      var value = model[field]
+      if (ctrl.id && ctrl.name !== ctrl.id) {
+        if (!value || !Array.isArray(value)) {
+          value = []
+        }
+        value.includes(ctrl.value)
+          ? (value = value.filter(function (v) {
+              return v !== ctrl.value
+            }))
+          : value.push(ctrl.value)
+        model[field] = value
+      } else {
+        var v = valueOfCheckbox(ctrl)
+        model[field] = v
+      }
+    } else if (type === "radio") {
+      if (field.indexOf(".") < 0 && field.indexOf("[") < 0) {
+        model[field] = ctrl.value
+      } else {
+        reflect_1.setValue(model, field, ctrl.value)
+      }
+    } else if (type === "date" || type === "datetime-local") {
+      try {
+        var selectedDate = new Date(ctrl.value)
+        reflect_1.setValue(model, field, ctrl.value && ctrl.value !== "" ? selectedDate.toISOString() : null)
+      } catch (error) {
+        console.error("Error occurred while formatting date:", error)
+      }
+    } else if (type === "time") {
+      var objSet = {}
+      try {
+        var selectedDate = new Date(ctrl.value)
+        reflect_1.setValue(model, field, selectedDate.getTime())
+      } catch (error) {
+        console.error("Error occurred while formatting time:", error)
+      }
+      return objSet
+    } else {
+      reflect_1.setValue(o, field, ctrl.value)
+    }
+  }
+  setObj(__assign({}, o))
+}
+exports.updateState = updateState
 exports.enLocale = {
   id: "en-US",
   countryCode: "US",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-hook-core",
-  "version": "0.4.19",
+  "version": "0.4.21",
   "description": "react",
   "main": "./lib/index.js",
   "types": "./src/index.ts",
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/react": "^17.0.41",
     "@types/react-router-dom": "^5.3.3",
-    "query-string": "^6.13.1",
+    "query-string": "^9.2.2",
     "react": "^17.0.2",
     "react-router-dom": "^6.2.2",
     "tslint": "^5.10.0",

package/src/route.ts

@@ -1,4 +1,4 @@
-import * as qs from "query-string"
+import queryString from "query-string"
 import { NavigateFunction } from "react-router-dom"
 import { StringMap } from "./core"
 import { hasDiff } from "./reflect"
@@ -30,7 +30,7 @@ export function buildParameters<T>(url: string, model?: T): T {
     urlSearch = url.substring(i + 1)
   }
   try {
-    const parsed: any = convertToObject<T>(qs.parse(urlSearch), model)
+    const parsed: any = convertToObject<T>(queryString.parse(urlSearch), model)
     return parsed
   } catch (error) {
     console.log(error)

package/src/state.ts

@@ -1,7 +1,90 @@
+import { ChangeEvent } from "react"
 import { Locale } from "./core"
 import { setValue } from "./reflect"
 import { valueOf } from "./util"
 
+export function getDecimalSeparator(ele: HTMLInputElement): string {
+  let separator = ele.getAttribute("data-decimal-separator")
+  if (!separator) {
+    const form = ele.form
+    if (form) {
+      separator = form.getAttribute("data-decimal-separator")
+    }
+  }
+  return separator === "," ? "," : "."
+}
+
+const r1 = / |,|\$|€|£|¥|'|٬|،| /g
+const r2 = / |\.|\$|€|£|¥|'|٬|،| /g
+export function updateState<T>(e: ChangeEvent<HTMLInputElement, HTMLInputElement>, o: T, setObj: (v: React.SetStateAction<T>) => void) {
+  const ctrl = e.target
+  const dataField = ctrl.getAttribute("data-field")
+  const field = dataField ? dataField : ctrl.name
+  if (ctrl.tagName === "SELECT") {
+    if (ctrl.tagName === "SELECT") {
+      if (ctrl.value === "" || !ctrl.value) {
+        ctrl.removeAttribute("data-value")
+      } else {
+        ctrl.setAttribute("data-value", "data-value")
+      }
+    }
+    setValue(o, field, ctrl.value)
+  } else {
+    let stype = ctrl.getAttribute("type")
+    const type: string = stype ? stype.toLowerCase() : "text"
+    let model: any = o
+    if (type === "text") {
+      const datatype = ctrl.getAttribute("data-type")
+      if (datatype === "number" || datatype === "integer") {
+        const decimalSeparator = getDecimalSeparator(ctrl)
+        const v0: string = ctrl.value
+        const v = decimalSeparator === "," ? v0.replace(r2, "") : v0.replace(r1, "")
+        const val = isNaN(v as any) ? undefined : parseFloat(v)
+        setValue(o, field, val)
+      } else {
+        setValue(o, field, ctrl.value)
+      }
+    } else if (type === "checkbox") {
+      let value = model[field]
+      if (ctrl.id && ctrl.name !== ctrl.id) {
+        if (!value || !Array.isArray(value)) {
+          value = []
+        }
+        value.includes(ctrl.value) ? (value = value.filter((v: string) => v !== ctrl.value)) : value.push(ctrl.value)
+        model[field] = value
+      } else {
+        const v = valueOfCheckbox(ctrl)
+        model[field] = v
+      }
+    } else if (type === "radio") {
+      if (field.indexOf(".") < 0 && field.indexOf("[") < 0) {
+        model[field] = ctrl.value
+      } else {
+        setValue(model, field, ctrl.value)
+      }
+    } else if (type === "date" || type === "datetime-local") {
+      try {
+        const selectedDate = new Date(ctrl.value)
+        setValue(model, field, ctrl.value && ctrl.value !== "" ? selectedDate.toISOString() : null)
+      } catch (error) {
+        console.error("Error occurred while formatting date:", error)
+      }
+    } else if (type === "time") {
+      const objSet: any = {}
+      try {
+        const selectedDate = new Date(ctrl.value)
+        setValue(model, field, selectedDate.getTime())
+      } catch (error) {
+        console.error("Error occurred while formatting time:", error)
+      }
+      return objSet
+    } else {
+      setValue(o, field, ctrl.value)
+    }
+  }
+  setObj({ ...o })
+}
+
 export const enLocale = {
   id: "en-US",
   countryCode: "US",