@kaspernj/api-maker 1.0.429 → 1.0.431

package/package.json

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

package/src/bootstrap/paginate.jsx

@@ -5,7 +5,7 @@ import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
 import qs from "qs"
 import {memo, useMemo} from "react"
-import {Text} from "react-native"
+import Text from "../utils/text"
 import Result from "../result"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
 import urlEncode from "../url-encode.mjs"

package/src/bootstrap/sort-link.jsx

@@ -3,7 +3,7 @@ import * as inflection from "inflection"
 import PropTypes from "prop-types"
 import qs from "qs"
 import {memo} from "react"
-import {Text} from "react-native"
+import Text from "../utils/text"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
 import urlEncode from "../url-encode.mjs"
 

package/src/super-admin/edit-page/edit-attribute-content.jsx

@@ -34,13 +34,20 @@ export default memo(shapeComponent(class EditAttributeContent extends BaseCompon
         id,
         model
       },
-      onChangeValue: this.tt.onChangeValue
-    }), [attribute.attribute, id, model])
+      onChangeValue: this.tt.onChangeValue,
+      value: this.s.value
+    }), [attribute.attribute, id, model, this.s.value])
 
     return attribute.content(contentArgs)
   }
 
-  defaultValue = () => this.p.model[this.p.attribute.attribute]() || ""
+  defaultValue = () => {
+    if (!(this.p.attribute.attribute in this.p.model)) {
+      throw new Error(`No attribute called ${this.p.attribute.attribute} in model ${this.p.model.modelClassData().name}`)
+    }
+
+    return this.p.model[this.p.attribute.attribute]() || ""
+  }
 
   onChangeValue = (newValue) => {
     this.setState({value: newValue})

package/src/super-admin/edit-page/edit-attribute-input.jsx

@@ -1,9 +1,10 @@
 import {memo, useMemo} from "react"
-import {Text, TextInput, View} from "react-native"
+import {TextInput, View} from "react-native"
 import BaseComponent from "../../base-component"
 import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
+import Text from "../../utils/text"
 import {useForm} from "../../form"
 
 export default memo(shapeComponent(class EditAttributeInput extends BaseComponent {
@@ -41,7 +42,7 @@ export default memo(shapeComponent(class EditAttributeInput extends BaseComponen
     }
 
     return (
-      <View style={{marginBottom: 12}}>
+      <View dataSet={{component: "api-maker/super-admin/edit-page/edit-attribute-input"}}>
         <Text>{label}</Text>
         <View>
           <TextInput

package/src/super-admin/edit-page/edit-attribute.jsx

@@ -7,6 +7,7 @@ import Locales from "shared/locales"
 import {memo} from "react"
 import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
+import {View} from "react-native"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
 
 export default memo(shapeComponent(class EditAttribute extends BaseComponent {
@@ -22,7 +23,7 @@ export default memo(shapeComponent(class EditAttribute extends BaseComponent {
     const camelizedLower = digg(modelClass.modelClassData(), "camelizedLower")
 
     return (
-      <>
+      <View dataSet={{component: "api-maker/super-admin/edit-page/edit-attribute"}} style={{marginBottom: attribute.translated ? undefined : 12}}>
         {attribute.content &&
           <EditAttributeContent
             attribute={attribute}
@@ -32,14 +33,15 @@ export default memo(shapeComponent(class EditAttribute extends BaseComponent {
           />
         }
         {!attribute.content && attribute.translated && availableLocales.map((locale) =>
-          <EditAttributeInput
-            attributeName={`${attribute.attribute}${inflection.camelize(locale)}`}
-            id={`${inflection.underscore(camelizedLower)}_${inflection.underscore(attribute.attribute)}_${locale}`}
-            label={`${modelClass.humanAttributeName(attribute.attribute)} (${locale})`}
-            model={model}
-            name={`${inflection.underscore(attribute.attribute)}_${locale}`}
-            key={locale}
-          />
+          <View key={locale} style={{marginBottom: 12}}>
+            <EditAttributeInput
+              attributeName={`${attribute.attribute}${inflection.camelize(locale)}`}
+              id={`${inflection.underscore(camelizedLower)}_${inflection.underscore(attribute.attribute)}_${locale}`}
+              label={`${modelClass.humanAttributeName(attribute.attribute)} (${locale})`}
+              model={model}
+              name={`${inflection.underscore(attribute.attribute)}_${locale}`}
+            />
+          </View>
         )}
         {!attribute.content && !attribute.translated &&
           <EditAttributeInput
@@ -50,7 +52,7 @@ export default memo(shapeComponent(class EditAttribute extends BaseComponent {
             name={inflection.underscore(attribute.attribute)}
           />
         }
-      </>
+      </View>
     )
   }
 }))

package/src/super-admin/edit-page.jsx

@@ -1,4 +1,4 @@
-import {Pressable, Text, View} from "react-native"
+import {Pressable, View} from "react-native"
 import BaseComponent from "../base-component"
 import ConfigReader from "./config-reader.jsx"
 import {digg} from "diggerize"
@@ -10,6 +10,7 @@ import {memo} from "react"
 import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
+import Text from "../utils/text"
 import useCurrentUser from "../use-current-user"
 import useModel from "../use-model"
 import useQueryParams from "on-location-changed/src/use-query-params"

package/src/super-admin/index.jsx

@@ -1,4 +1,4 @@
-import {Pressable, Text} from "react-native"
+import {Pressable} from "react-native"
 import BaseComponent from "../base-component"
 import EditPage from "./edit-page"
 import hasEditConfig from "./has-edit-config.js"
@@ -11,6 +11,7 @@ import {shapeComponent} from "set-state-compare/src/shape-component.js"
 import ShowPage from "./show-page"
 import ShowReflectionActions from "./show-reflection-actions"
 import ShowReflectionPage from "./show-reflection-page"
+import Text from "../utils/text"
 import useCanCan from "../use-can-can"
 import useCurrentUser from "../use-current-user.mjs"
 import useQueryParams from "on-location-changed/src/use-query-params"

package/src/super-admin/layout/header/index.jsx

@@ -5,7 +5,8 @@ import {memo, useRef} from "react"
 import PropTypes from "prop-types"
 import PropTypesExact from "prop-types-exact"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
-import {Pressable, Text, View} from "react-native"
+import Text from "../../../utils/text"
+import {Pressable, View} from "react-native"
 import useBreakpoint from "../../../use-breakpoint"
 import useEventListener from "../../../use-event-listener"
 

package/src/super-admin/layout/menu/index.jsx

@@ -7,9 +7,10 @@ import MenuItem from "./menu-item"
 import PropTypes from "prop-types"
 import PropTypesExact from "prop-types-exact"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
+import Text from "../../../utils/text"
 import useCurrentUser from "../../../use-current-user"
 import useI18n from "i18n-on-steroids/src/use-i18n.mjs"
-import {Text, View} from "react-native"
+import {View} from "react-native"
 
 export default memo(shapeComponent(class ComponentsAdminLayoutMenu extends BaseComponent {
   static propTypes = PropTypesExact({

package/src/super-admin/layout/menu/menu-item/index.jsx

@@ -5,7 +5,7 @@ import Link from "../../../../link"
 import {memo} from "react"
 import PropTypes from "prop-types"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
-import {Text} from "react-native"
+import Text from "../../../../utils/text"
 
 export default memo(shapeComponent(class ComponentsAdminLayoutMenuMenuItem extends BaseComponent {
   static propTypes = {

package/src/super-admin/show-nav.jsx

@@ -5,9 +5,10 @@ import PropTypesExact from "prop-types-exact"
 import {memo} from "react"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
 import ShowReflectionLink from "./show-reflection-link"
+import Text from "../utils/text"
 import useI18n from "i18n-on-steroids/src/use-i18n.mjs"
 import useQueryParams from "on-location-changed/src/use-query-params"
-import {Text, View} from "react-native"
+import {View} from "react-native"
 
 export default memo(shapeComponent(class ApiMakerSuperAdminShowNav extends BaseComponent {
   static propTypes = PropTypesExact({

package/src/super-admin/show-page/belongs-to-attribute-row.jsx

@@ -5,7 +5,7 @@ import Link from "../../link"
 import {memo} from "react"
 import Params from "../../params"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
-import {Text} from "react-native"
+import Text from "../../utils/text"
 
 export default memo(shapeComponent(class ApiMakerSuperAdminShowPageBelongsToAttributeRow extends BaseComponent {
   render() {

package/src/super-admin/show-reflection-link.jsx

@@ -3,7 +3,7 @@ import {digg} from "diggerize"
 import Link from "../link"
 import {memo} from "react"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
-import {Text} from "react-native"
+import Text from "../utils/text"
 import {useMemo} from "react"
 
 export default memo(shapeComponent(class ApiMakerSuperAdminShowReflectionLink extends BaseComponent {

package/src/table/column-content.jsx

@@ -2,7 +2,7 @@ import {digs} from "diggerize"
 import * as inflection from "inflection"
 import modelCallbackArgs from "./model-callback-args.mjs"
 import MoneyFormatter from "../money-formatter"
-import {Text} from "react-native"
+import Text from "../utils/text"
 
 export default class ApiMakerTableColumnContent {
   constructor({column, mode = "react-native", model, table}) {

package/src/table/filters/attribute-element.jsx

@@ -3,8 +3,9 @@ import {digg} from "diggerize"
 import PropTypes from "prop-types"
 import PropTypesExact from "prop-types-exact"
 import {memo} from "react"
-import {Pressable, Text} from "react-native"
+import {Pressable} from "react-native"
 import {shapeComponent} from "set-state-compare/src/shape-component"
+import Text from "../../utils/text"
 
 export default memo(shapeComponent(class AttributeElement extends BaseComponent {
   static propTypes = PropTypesExact({

package/src/table/filters/filter-form.jsx

@@ -7,12 +7,13 @@ import Input from "../../inputs/input"
 import PropTypes from "prop-types"
 import PropTypesExact from "prop-types-exact"
 import {memo, useMemo, useRef} from "react"
-import {ActivityIndicator, Text, View} from "react-native"
+import {ActivityIndicator, View} from "react-native"
 import ReflectionElement from "./reflection-element"
 import ScopeElement from "./scope-element"
 import Select from "../../inputs/select"
 import Services from "../../services.mjs"
 import {shapeComponent} from "set-state-compare/src/shape-component"
+import Text from "../../utils/text"
 
 export default memo(shapeComponent(class ApiMakerTableFiltersFilterForm extends BaseComponent {
   static propTypes = PropTypesExact({

package/src/table/filters/filter.jsx

@@ -1,10 +1,11 @@
-import {Pressable, Text, View} from "react-native"
+import {Pressable, View} from "react-native"
 import BaseComponent from "../../base-component"
 import FontAwesomeIcon from "react-native-vector-icons/FontAwesome"
 import PropTypes from "prop-types"
 import PropTypesExact from "prop-types-exact"
 import {memo} from "react"
 import {shapeComponent} from "set-state-compare/src/shape-component"
+import Text from "../../utils/text"
 
 export default memo(shapeComponent(class ApiMakerTableFilter extends BaseComponent {
   static defaultProps = {

package/src/table/filters/load-search-modal.jsx

@@ -5,7 +5,8 @@ import {digg} from "diggerize"
 import {memo, useMemo} from "react"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
 import {TableSearch} from "../../models.mjs.erb"
-import {Pressable, Text, View} from "react-native"
+import {Pressable, View} from "react-native"
+import Text from "../../utils/text"
 import useI18n from "i18n-on-steroids/src/use-i18n.mjs"
 
 const SearchLink = memo(shapeComponent(class SearchLink extends BaseComponent {

package/src/table/filters/reflection-element.jsx

@@ -2,8 +2,9 @@ import BaseComponent from "../../base-component"
 import PropTypes from "prop-types"
 import PropTypesExact from "prop-types-exact"
 import {memo} from "react"
-import {Pressable, Text} from "react-native"
+import {Pressable} from "react-native"
 import {shapeComponent} from "set-state-compare/src/shape-component"
+import Text from "../../utils/text"
 
 export default memo(shapeComponent(class ReflectionElement extends BaseComponent {
   static propTypes = PropTypesExact({

package/src/table/filters/scope-element.jsx

@@ -1,8 +1,9 @@
 import BaseComponent from "../../base-component"
 import PropTypes from "prop-types"
 import {memo} from "react"
-import {Pressable, Text} from "react-native"
+import {Pressable} from "react-native"
 import {shapeComponent} from "set-state-compare/src/shape-component"
+import Text from "../../utils/text"
 
 export default memo(shapeComponent(class ScopeElement extends BaseComponent {
   static defaultProps = {

package/src/table/header-column.jsx

@@ -3,11 +3,12 @@ import classNames from "classnames"
 import {digs} from "diggerize"
 import Header from "./components/header"
 import {memo} from "react"
-import {Platform, Pressable, Text, View} from "react-native"
+import {Platform, Pressable, View} from "react-native"
 import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
 import {shapeComponent} from "set-state-compare/src/shape-component"
 import SortLink from "../bootstrap/sort-link"
+import Text from "../utils/text"
 import useEventListener from "../use-event-listener.mjs"
 import Widths from "./widths"
 

package/src/table/model-column.jsx

@@ -1,4 +1,4 @@
-import {Text, View} from "react-native"
+import {View} from "react-native"
 import BaseComponent from "../base-component"
 import classNames from "classnames"
 import Column from "./components/column"
@@ -8,6 +8,7 @@ import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
 import {memo} from "react"
 import {shapeComponent} from "set-state-compare/src/shape-component"
+import Text from "../utils/text"
 
 export default memo(shapeComponent(class ApiMakerTableModelColumn extends BaseComponent {
   static propTypes = propTypesExact({

package/src/table/settings/column-row.jsx

@@ -4,7 +4,8 @@ import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
 import {memo, useEffect, useRef} from "react"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
-import {Text, View} from "react-native"
+import Text from "../../utils/text"
+import {View} from "react-native"
 
 export default memo(shapeComponent(class ColumnRow extends BaseComponent {
   static propTypes = propTypesExact({

package/src/table/settings/download-action.jsx

@@ -9,7 +9,8 @@ import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
 import {renderToString} from "react-dom/server"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
-import {Pressable, Text} from "react-native"
+import {Pressable} from "react-native"
+import Text from "../../utils/text"
 
 export default memo(shapeComponent(class ApiMakerTableSettingsDownloadAction extends BaseComponent {
   static propTypes = propTypesExact({

package/src/table/settings/index.jsx

@@ -7,7 +7,8 @@ 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 {Text, View} from "react-native"
+import {View} from "react-native"
+import Text from "../../utils/text"
 import useI18n from "i18n-on-steroids/src/use-i18n.mjs"
 
 export default memo(shapeComponent(class ApiMakerTableSettings extends BaseComponent {

package/src/table/table.jsx

@@ -1,5 +1,5 @@
 import {digg, digs} from "diggerize"
-import {Pressable, StyleSheet, Text, View} from "react-native"
+import {Pressable, StyleSheet, View} from "react-native"
 import BaseComponent from "../base-component"
 import Card from "../bootstrap/card"
 import classNames from "classnames"
@@ -24,6 +24,7 @@ import Select from "../inputs/select"
 import Settings from "./settings"
 import {shapeComponent} from "set-state-compare/src/shape-component"
 import TableSettings from "./table-settings"
+import Text from "../utils/text"
 import uniqunize from "uniqunize"
 import useBreakpoint from "../use-breakpoint"
 import useCollection from "../use-collection"

package/src/utils/checkbox.jsx

@@ -1,9 +1,10 @@
 import BaseComponent from "../base-component"
-import {CheckBox, Text, View} from "react-native"
+import {CheckBox, View} from "react-native"
 import {memo} from "react"
 import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
+import Text from "../utils/text"
 
 export default memo(shapeComponent(class ApiMakerUtilsCheckbox extends BaseComponent {
   static defaultProps = {

package/src/utils/default-style.jsx

@@ -0,0 +1,25 @@
+import {createContext, useContext} from "react"
+import memo from "set-state-compare/src/memo"
+
+const DefaultStyleContext = createContext({
+  Text: {}
+})
+
+const useDefaultStyle = () => {
+  const defaultStyle = useContext(DefaultStyleContext)
+
+  return defaultStyle
+}
+
+const WithDefaultStyle = memo((props) => {
+  const defaultStyle = useContext(DefaultStyleContext)
+  const newDefaultStyle = Object.assign({}, defaultStyle, props.style)
+
+  return (
+    <DefaultStyleContext.Provider value={newDefaultStyle}>
+      {props.children}
+    </DefaultStyleContext.Provider>
+  )
+})
+
+export {useDefaultStyle, WithDefaultStyle}

package/src/utils/text.jsx

@@ -0,0 +1,15 @@
+import memo from "set-state-compare/src/memo"
+import {Text} from "react-native"
+import {useDefaultStyle, WithDefaultStyle} from "./default-style"
+
+export default memo((props) => {
+  const {style, ...restProps} = props
+  const defaultStyle = useDefaultStyle()
+  const actualStyle = Object.assign({}, defaultStyle?.Text, style)
+
+  return (
+    <WithDefaultStyle style={actualStyle}>
+      <Text style={actualStyle} {...restProps} />
+    </WithDefaultStyle>
+  )
+})