@kaspernj/api-maker 1.0.443 → 1.0.445

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaspernj/api-maker",
-  "version": "1.0.443",
+  "version": "1.0.445",
   "type": "module",
   "description": "",
   "main": "index.js",
@@ -37,7 +37,7 @@
     "qs": ">= 6.9.3",
     "react-native-vector-icons": "^10.2.0",
     "replaceall": ">= 0.1.6",
-    "set-state-compare": ">= 1.0.51",
+    "set-state-compare": ">= 1.0.53",
     "spark-md5": "^3.0.2",
     "stacktrace-parser": "^0.1.10",
     "strftime": ">= 0.10.0",

package/src/inputs/attachment.jsx

@@ -54,7 +54,7 @@ export default memo(shapeComponent(class ApiMakerInputsAttachment extends BaseCo
   }
 
   getContentType() {
-    const {attribute, model} = digs(this.props, "attribute", "model")
+    const {attribute, model} = this.p
     const attributeName = `${attribute}ContentType`
 
     if (!(attributeName in model)) throw new Error(`No such method on ${model.modelClassData().name}: ${attributeName}`)
@@ -63,7 +63,7 @@ export default memo(shapeComponent(class ApiMakerInputsAttachment extends BaseCo
   }
 
   getPurgeInputId() {
-    const {inputProps} = digs(this.props, "inputProps")
+    const {inputProps} = this.tt
 
     return `${inputProps.id}_purge`
   }
@@ -71,7 +71,7 @@ export default memo(shapeComponent(class ApiMakerInputsAttachment extends BaseCo
   getPurgeInputName() {
     if ("purgeName" in this.props) return this.props.purgeName
 
-    const {inputProps} = digs(this.props, "inputProps")
+    const {inputProps} = this.tt
 
     if (!inputProps.name) return null
 
@@ -82,7 +82,7 @@ export default memo(shapeComponent(class ApiMakerInputsAttachment extends BaseCo
   }
 
   getUrl() {
-    const {attribute, model} = digs(this.props, "attribute", "model")
+    const {attribute, model} = this.p
     const attributeName = `${attribute}Url`
 
     if (!(attributeName in model)) throw new Error(`No such method on ${model.modelClassData().name}: ${attributeName}`)

package/src/inputs/checkbox.jsx

@@ -7,6 +7,7 @@ import memo from "set-state-compare/src/memo"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
 import useInput from "../use-input"
 import {useForm} from "../form"
+import {useMemo} from "react"
 
 export default memo(shapeComponent(class ApiMakerInputsCheckbox extends BaseComponent {
   static defaultProps = {
@@ -88,11 +89,22 @@ export default memo(shapeComponent(class ApiMakerInputsCheckbox extends BaseComp
   }
 
   onChanged = (...args) => {
-    const {form} = this.tt
-    const {attribute, autoSubmit, model, name, onChange} = this.props
+    const {form, inputProps} = this.tt
+    const {attribute, autoSubmit, model, onChange} = this.props
+    const {name} = inputProps
 
     if (attribute && autoSubmit && model) new AutoSubmit({component: this}).autoSubmit()
-    if (form && name) form.setValue(name, args[0].target.checked)
+
+    console.log("onChanged", {form, name})
+
+    if (form && name) {
+      const checked = args[0].target.checked
+
+      console.log("Checkbox onChanged", {checked})
+
+      form.setValue(name, checked)
+    }
+
     if (onChange) onChange(...args)
   }
 

package/src/use-can-can.mjs

@@ -6,7 +6,10 @@ import useShape from "set-state-compare/src/use-shape.js"
 const useCanCan = (abilitiesCallback, dependencies) => {
   const currentUser = useCurrentUser()
   const s = useShape({abilitiesCallback})
-  const [canCan, setCanCan] = useState()
+
+  s.useStates({
+    canCan: null
+  })
 
   if (!dependencies) {
     dependencies = [currentUser?.id()]
@@ -18,16 +21,16 @@ const useCanCan = (abilitiesCallback, dependencies) => {
 
     await canCan.loadAbilities(abilities)
 
-    setCanCan(canCan)
+    s.set({canCan})
   }, [])
 
   const onResetAbilities = useCallback(() => {
-    setCanCan(undefined)
+    s.set({canCan: null}, {silent: true})
     loadAbilities()
   }, [])
 
   useMemo(() => {
-    setCanCan(undefined)
+    s.set({canCan: null}, {silent: true})
     loadAbilities()
   }, dependencies)
 
@@ -39,7 +42,7 @@ const useCanCan = (abilitiesCallback, dependencies) => {
     }
   }, [])
 
-  return canCan
+  return s.s.canCan
 }
 
 export default useCanCan