@rpcbase/client 0.192.0 → 0.194.0-mongoosetsindex.0

package/helpers/postRPC.js

@@ -4,7 +4,7 @@ import axios from "axios"
 import _get from "lodash/get"
 import _set from "lodash/set"
 
-import get_txn_id from "@rpcbase/std/get_txn_id"
+import {get_txn_id} from "@rpcbase/std"
 
 import getBaseUrl from "../getBaseUrl"
 import getTenantId from "../auth/getTenantId"

package/i18n/index.js

@@ -4,7 +4,7 @@ import {initReactI18next} from "react-i18next"
 import ChainedBackend from "i18next-chained-backend"
 import resourcesToBackend from "i18next-resources-to-backend"
 
-import getLocaleFromCode from "@rpcbase/std/get_locale_from_code"
+import {getLocaleFromCode} from "@rpcbase/std"
 
 import {RB_DEFAULT_LOCALE, RB_LOCALES} from "env"
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/client",
-  "version": "0.192.0",
+  "version": "0.194.0-mongoosetsindex.0",
   "scripts": {
     "build": "../../node_modules/.bin/wireit",
     "test": "../../node_modules/.bin/wireit"

package/types.ts

@@ -0,0 +1,6 @@
+
+export type NestedKeyOf<ObjectType extends object> =
+{[Key in keyof ObjectType & (string | number)]: ObjectType[Key] extends object
+? `${Key}` | `${Key}.${NestedKeyOf<ObjectType[Key]>}`
+: `${Key}`
+}[keyof ObjectType & (string | number)];

package/ui/Modal/HashStateModal.js

@@ -13,8 +13,6 @@ const HashStateModal = ({hashPropName, children}) => {
 
   const show = !!hashState[hashPropName]
 
-  console.log("WOWOOW", show)
-
   if (!show) return null
 
   const onHide = () => {

package/ui/SubmitButton/index.js

@@ -1,4 +1,4 @@
-/* @flow */
+import {useFormContext} from "react-hook-form"
 import ActivityIndicator from "../ActivityIndicator"
 
 
@@ -10,23 +10,40 @@ type Props = {
   onClick: Function,
 }
 
-const SubmitButton = ({className = "", id = "btn-submit", ...props}: Props) => (
-  <button
-    id={id}
-    type="submit"
-    className={cx("submit-button btn btn-primary fw-bold d-flex flex-row align-items-center", className)}
-    disabled={props.disabled || props.isLoading}
-    onClick={props.onClick}
-  >
-    {props.isLoading && (
-      <>
-        <ActivityIndicator style={{marginRight: 6}} color="#FFF" size={15} />
-
-        {props.children}
-      </>
-    )}
-    {!props.isLoading && <>{props.children}</>}
-  </button>
-)
-
-export default SubmitButton
+export const SubmitButton = ({
+  className = "",
+  id = "btn-submit",
+  title,
+  submittingTitle,
+  children,
+  ...props
+}: Props) => {
+
+  const {formState} = useFormContext()
+
+  const {isSubmitting} = formState
+
+  const isDisabled = props.disabled || props.isLoading || isSubmitting
+  const isLoading = props.isLoading || isSubmitting
+
+  if (title && children) {
+    throw new Error("button cannot have both title and children props")
+  }
+
+  return (
+    <button
+      id={id}
+      type="submit"
+      className={cx("btn btn-primary d-flex flex-row align-items-center align-self-start", className)}
+      disabled={isDisabled}
+      onClick={props.onClick}
+    >
+      {isLoading && (
+        <ActivityIndicator style={{marginRight: 7}} color="#FFF" size={15} />
+      )}
+      {title && !isSubmitting && title}
+      {submittingTitle && isSubmitting && submittingTitle}
+      {children}
+    </button>
+  )
+}