@kaspernj/api-maker 1.0.425 → 1.0.427

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaspernj/api-maker",
-  "version": "1.0.425",
+  "version": "1.0.427",
   "type": "module",
   "description": "",
   "main": "index.js",

package/src/modal.jsx

@@ -0,0 +1,36 @@
+import BaseComponent from "./base-component"
+import {memo} from "react"
+import {shapeComponent} from "set-state-compare/src/shape-component.js"
+import {Modal, Pressable, View} from "react-native"
+
+export default memo(shapeComponent(class ApiMakerModal extends BaseComponent {
+  render() {
+    const {children, onRequestClose, ...restProps} = this.props
+
+    return (
+      <Modal onRequestClose={onRequestClose} {...restProps}>
+        <View
+          style={{
+            alignItems: "center",
+            justifyContent: "center",
+            minWidth: "100%",
+            minHeight: "100%",
+            padding: 20,
+          }}
+        >
+          <Pressable
+            dataSet={{class: "modal-backdrop"}}
+            onPress={onRequestClose}
+            style={{
+              position: "absolute",
+              minWidth: "100%",
+              minHeight: "100%",
+              backgroundColor: "rgba(0, 0, 0, 0.5)"
+            }}
+          />
+          {children}
+        </View>
+      </Modal>
+    )
+  }
+}))

package/src/table/settings/index.jsx

@@ -3,10 +3,12 @@ import columnIdentifier from "../column-identifier.mjs"
 import ColumnRow from "./column-row"
 import DownloadAction from "./download-action"
 import {memo, useRef} from "react"
+import Modal from "../../modal"
 import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
-import {Modal, Text, View} from "react-native"
+import {Text, View} from "react-native"
+import useI18n from "i18n-on-steroids/src/use-i18n.mjs"
 
 export default memo(shapeComponent(class ApiMakerTableSettings extends BaseComponent {
   static propTypes = propTypesExact({
@@ -15,24 +17,26 @@ export default memo(shapeComponent(class ApiMakerTableSettings extends BaseCompo
   })
 
   setup() {
+    const {t} = useI18n({namespace: "js.api_maker.table.settings"})
+
     this.rootRef = useRef()
+    this.t = t
   }
 
   tableSetting = () => this.p.table.s.tableSetting
 
   render() {
+    const {t} = this.tt
     const {table} = this.p
     const {preparedColumns} = table.s
 
     return (
-      <Modal onBackdropPress={this.p.onRequestClose} onRequestClose={this.p.onRequestClose} transparent>
+      <Modal onBackdropPress={this.p.onRequestClose} onRequestClose={this.p.onRequestClose} style={{backgroundColor: "#000"}} transparent>
         <View
           dataSet={{class: "api-maker--table--settings"}}
           style={{
             width: "100%",
             maxWidth: 800,
-            marginHorizontal: "auto",
-            marginVertical: "auto",
             padding: 20,
             backgroundColor: "#fff",
             border: "1px solid black"
@@ -40,13 +44,13 @@ export default memo(shapeComponent(class ApiMakerTableSettings extends BaseCompo
         >
           <View style={{marginBottom: 5}}>
             <Text style={{fontSize: 16, fontWeight: "bold"}}>
-              Settings
+              {t(".settings", {defaultValue: "Settings"})}
             </Text>
           </View>
           <DownloadAction table={table} />
           <View style={{marginBottom: 5}}>
             <Text style={{fontSize: 16, fontWeight: "bold"}}>
-              Columns
+              {t(".columns", {defaultValue: "Columns"})}
             </Text>
           </View>
           {preparedColumns?.map(({column, tableSettingColumn}) =>

package/src/use-model.mjs

@@ -22,6 +22,12 @@ const useModel = (modelClassArg, argsArg = {}) => {
     notFound: undefined
   })
 
+  if ("active" in s.props && !s.props.active) {
+    s.meta.active = false
+  } else {
+    s.meta.active = true
+  }
+
   if (typeof modelClassArg == "object") {
     modelClass = modelClassArg.callback({queryParams})
   } else {
@@ -83,7 +89,7 @@ const useModel = (modelClassArg, argsArg = {}) => {
   }, [])
 
   const loadModel = useCallback(async () => {
-    if ("active" in s.props && !s.props.active) {
+    if (!s.m.active) {
       // Not active - don't do anything
     } else if (s.props.newIfNoId && !s.m.modelId) {
       return await loadNewModel()