react-store-input 0.1.1 → 0.1.3

package/dist/use_store_input.d.ts

@@ -1,19 +1,24 @@
-import React__default, { DetailedHTMLProps, InputHTMLAttributes, SelectHTMLAttributes, TextareaHTMLAttributes } from 'react';
+import * as React$1 from 'react';
+import { Ref, HTMLInputTypeAttribute } from 'react';
 import { Store } from './use_store.js';
 
-type StoreInputProps<TElement extends HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement, TState> = Omit<TElement extends HTMLInputElement ? DetailedHTMLProps<InputHTMLAttributes<HTMLInputElement>, HTMLInputElement> : TElement extends HTMLSelectElement ? DetailedHTMLProps<SelectHTMLAttributes<HTMLSelectElement>, HTMLSelectElement> : DetailedHTMLProps<TextareaHTMLAttributes<HTMLTextAreaElement>, HTMLTextAreaElement>, "name"> & {
-    name: keyof TState;
+type StoreInputProps<TInputElement, TState> = {
+    ref?: Ref<TInputElement>;
+    type?: HTMLInputTypeAttribute;
+    defaultValue?: string | number | readonly string[] | undefined;
+    value?: string | number | readonly string[] | undefined;
+    defaultChecked?: boolean | undefined;
+    onChange?: (event: React.ChangeEvent<TInputElement>) => void;
+} & {
+    getter: (state: TState) => unknown;
+    setter: (state: TState, value: unknown) => void;
 };
-declare function useStoreInput<TState>(store: Store<TState>): {
-    input: React__default.FC<StoreInputProps<HTMLInputElement, TState>>;
-    select: React__default.FC<StoreInputProps<HTMLSelectElement, TState>>;
-    textarea: React__default.FC<StoreInputProps<HTMLTextAreaElement, TState>>;
+declare function useStoreInput<TInputElement extends HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement, TState>(store: Store<TState>, props: StoreInputProps<TInputElement, TState>): {
+    ref: React$1.RefObject<TInputElement | null>;
+    dispatchKey: string;
+    defaultValue: string | number | readonly string[] | undefined;
+    defaultChecked: boolean | undefined;
+    onChange: (event: React.ChangeEvent<TInputElement>) => void;
 };
-type StoreInputPropsWithStore<TElement extends HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement, TState> = StoreInputProps<TElement, TState> & {
-    store: Store<TState>;
-};
-declare function Input<TState>({ store, ...props }: StoreInputPropsWithStore<HTMLInputElement, TState>): React__default.JSX.Element;
-declare function Select<TState>({ store, ...props }: StoreInputPropsWithStore<HTMLSelectElement, TState>): React__default.JSX.Element;
-declare function Textarea<TState>({ store, ...props }: StoreInputPropsWithStore<HTMLTextAreaElement, TState>): React__default.JSX.Element;
 
-export { Input, Select, type StoreInputPropsWithStore, Textarea, useStoreInput };
+export { type StoreInputProps, useStoreInput };

package/dist/use_store_input.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,32 +15,74 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/use_store_input.tsx
 var use_store_input_exports = {};
 __export(use_store_input_exports, {
-  Input: () => Input,
-  Select: () => Select,
-  Textarea: () => Textarea,
   useStoreInput: () => useStoreInput
 });
 module.exports = __toCommonJS(use_store_input_exports);
+var import_react3 = require("react");
+var import_date_fns = require("date-fns");
+
+// src/use_store_controller.tsx
 var import_react2 = require("react");
-var import_react3 = __toESM(require("react"));
 
-// src/use_store_input_props.tsx
+// src/use_subscribe.tsx
 var import_react = require("react");
-var import_date_fns = require("date-fns");
-function useStoreInputProps(store, props) {
+function useSubscribe(store, subscriber) {
+  (0, import_react.useEffect)(() => {
+    const unsubscribe = store.subscribe(subscriber);
+    return () => {
+      unsubscribe();
+    };
+  }, [store]);
+}
+
+// src/use_store_controller.tsx
+function useStoreController(store, props) {
+  const ref = (0, import_react2.useRef)(null);
+  const dispatchKey = (0, import_react2.useId)();
+  (0, import_react2.useEffect)(() => {
+    const element = ref.current;
+    if (!element) {
+      return;
+    }
+    if (typeof props.ref === "function") {
+      props.ref(element);
+    } else if (props.ref) {
+      props.ref.current = element;
+    }
+  }, []);
+  useSubscribe(store, (state, key) => {
+    if (key === dispatchKey) {
+      return;
+    }
+    if (!ref.current) return;
+    props.onSubscribe(state, ref.current);
+  });
+  const onChange = () => {
+    store.dispatch(
+      (state) => {
+        const element = ref.current;
+        if (!element) return;
+        props.onDispatch(state, element);
+      },
+      {
+        key: dispatchKey
+      }
+    );
+  };
+  return {
+    dispatchKey,
+    ref,
+    onChange
+  };
+}
+
+// src/use_store_input.tsx
+function useStoreInput(store, props) {
   const toInputValue = (value) => {
     if (value === void 0 || value === null) {
       return "";
@@ -64,7 +104,7 @@ function useStoreInputProps(store, props) {
     if (props.type === "checkbox" || props.type === "radio") {
       return void 0;
     }
-    return toInputValue(store.state[props.name]);
+    return toInputValue(props.getter(store.state));
   };
   const toInputChecked = (value) => {
     if (props.type === "radio") {
@@ -79,135 +119,57 @@ function useStoreInputProps(store, props) {
     if (props.type !== "checkbox" && props.type !== "radio") {
       return void 0;
     }
-    return toInputChecked(store.state[props.name]);
+    return toInputChecked(props.getter(store.state));
   };
-  function useSubscriptionRef() {
-    const ref2 = (0, import_react.useRef)(null);
-    (0, import_react.useEffect)(() => {
-      const input = ref2.current;
-      if (!input) {
-        return;
-      }
-      if (typeof props.ref === "function") {
-        props.ref(input);
-      } else if (props.ref) {
-        props.ref.current = input;
-      }
-      return store.subscribe((state, key) => {
-        if (key === dispatchKey) {
-          return;
-        }
-        if (props.type === "checkbox" || props.type === "radio") {
-          const checked = toInputChecked(state[props.name]);
-          if (input.checked === checked) {
-            return;
-          }
-          input.checked = checked;
-        } else {
-          const value = toInputValue(state[props.name]);
-          if (input.value === value) {
-            return;
-          }
-          input.value = value;
-        }
-        const event = new Event("input", { bubbles: true });
-        input.dispatchEvent(event);
-      });
-    }, []);
-    return ref2;
-  }
   function toStateValue(value) {
-    if (typeof store.state[props.name] === "number") {
+    const selected = props.getter(store.state);
+    if (typeof selected === "number") {
       return Number(value);
     }
-    if (store.state[props.name] instanceof Date) {
+    if (selected instanceof Date) {
       return new Date(value);
     }
     return value;
   }
-  function createChangeEventHandler() {
-    return (e) => {
-      const target = e.target;
-      if (props.type === "checkbox") {
-        store.dispatch(
-          (state) => {
-            state[props.name] = target.checked;
-          },
-          {
-            key: dispatchKey
-          }
-        );
+  const inputProps = useStoreController(store, {
+    ref: props.ref,
+    onSubscribe: (state, element) => {
+      if ("checked" in element && (props.type === "checkbox" || props.type === "radio")) {
+        const checked = toInputChecked(props.getter(state));
+        if (element.checked === checked) {
+          return;
+        }
+        element.checked = checked;
       } else {
-        store.dispatch(
-          (state) => {
-            state[props.name] = toStateValue(target.value);
-          },
-          {
-            key: dispatchKey
-          }
-        );
+        const value = toInputValue(props.getter(state));
+        if (element.value === value) {
+          return;
+        }
+        element.value = value;
       }
-      props.onChange?.(e);
-    };
-  }
-  const dispatchKey = (0, import_react.useId)();
-  const ref = useSubscriptionRef();
-  const name = String(props.name);
-  const defaultValue = getDefaultValue();
-  const defaultChecked = getDefaultChecked();
-  const onChange = createChangeEventHandler();
-  return {
-    key: dispatchKey,
-    ref,
-    name,
-    defaultValue,
-    defaultChecked,
-    onChange
-  };
-}
-
-// src/use_store_input.tsx
-function useStoreInput(store) {
-  const input = (0, import_react2.useCallback)(function Component(props) {
-    return /* @__PURE__ */ import_react3.default.createElement(Input, { store, ...props });
-  }, []);
-  const select = (0, import_react2.useCallback)(function Component(props) {
-    return /* @__PURE__ */ import_react3.default.createElement(Select, { store, ...props });
-  }, []);
-  const textarea = (0, import_react2.useCallback)(function Component(props) {
-    return /* @__PURE__ */ import_react3.default.createElement(Textarea, { store, ...props });
-  }, []);
+      const event = new Event("input", { bubbles: true });
+      element.dispatchEvent(event);
+    },
+    onDispatch: (state, element) => {
+      if ("checked" in element && props.type === "checkbox") {
+        props.setter(state, element.checked);
+      } else {
+        props.setter(state, toStateValue(element.value));
+      }
+    }
+  });
   return {
-    input,
-    select,
-    textarea
+    ref: inputProps.ref,
+    dispatchKey: inputProps.dispatchKey,
+    defaultValue: getDefaultValue(),
+    defaultChecked: getDefaultChecked(),
+    onChange: (event) => {
+      inputProps.onChange();
+      props.onChange?.(event);
+    }
   };
 }
-function Input({
-  store,
-  ...props
-}) {
-  const storeProps = useStoreInputProps(store, props);
-  return /* @__PURE__ */ import_react3.default.createElement("input", { ...props, ...storeProps });
-}
-function Select({
-  store,
-  ...props
-}) {
-  const storeProps = useStoreInputProps(store, props);
-  return /* @__PURE__ */ import_react3.default.createElement("select", { ...props, ...storeProps });
-}
-function Textarea({
-  store,
-  ...props
-}) {
-  const storeProps = useStoreInputProps(store, props);
-  return /* @__PURE__ */ import_react3.default.createElement("textarea", { ...props, ...storeProps });
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  Input,
-  Select,
-  Textarea,
   useStoreInput
 });

package/dist/use_store_input.mjs

@@ -1,17 +1,64 @@
 // src/use_store_input.tsx
-import {
-  useCallback
-} from "react";
-import React from "react";
-
-// src/use_store_input_props.tsx
-import {
-  useEffect,
-  useId,
-  useRef
-} from "react";
+import "react";
 import { format } from "date-fns";
-function useStoreInputProps(store, props) {
+
+// src/use_store_controller.tsx
+import { useEffect as useEffect2, useId, useRef } from "react";
+
+// src/use_subscribe.tsx
+import { useEffect } from "react";
+function useSubscribe(store, subscriber) {
+  useEffect(() => {
+    const unsubscribe = store.subscribe(subscriber);
+    return () => {
+      unsubscribe();
+    };
+  }, [store]);
+}
+
+// src/use_store_controller.tsx
+function useStoreController(store, props) {
+  const ref = useRef(null);
+  const dispatchKey = useId();
+  useEffect2(() => {
+    const element = ref.current;
+    if (!element) {
+      return;
+    }
+    if (typeof props.ref === "function") {
+      props.ref(element);
+    } else if (props.ref) {
+      props.ref.current = element;
+    }
+  }, []);
+  useSubscribe(store, (state, key) => {
+    if (key === dispatchKey) {
+      return;
+    }
+    if (!ref.current) return;
+    props.onSubscribe(state, ref.current);
+  });
+  const onChange = () => {
+    store.dispatch(
+      (state) => {
+        const element = ref.current;
+        if (!element) return;
+        props.onDispatch(state, element);
+      },
+      {
+        key: dispatchKey
+      }
+    );
+  };
+  return {
+    dispatchKey,
+    ref,
+    onChange
+  };
+}
+
+// src/use_store_input.tsx
+function useStoreInput(store, props) {
   const toInputValue = (value) => {
     if (value === void 0 || value === null) {
       return "";
@@ -33,7 +80,7 @@ function useStoreInputProps(store, props) {
     if (props.type === "checkbox" || props.type === "radio") {
       return void 0;
     }
-    return toInputValue(store.state[props.name]);
+    return toInputValue(props.getter(store.state));
   };
   const toInputChecked = (value) => {
     if (props.type === "radio") {
@@ -48,134 +95,56 @@ function useStoreInputProps(store, props) {
     if (props.type !== "checkbox" && props.type !== "radio") {
       return void 0;
     }
-    return toInputChecked(store.state[props.name]);
+    return toInputChecked(props.getter(store.state));
   };
-  function useSubscriptionRef() {
-    const ref2 = useRef(null);
-    useEffect(() => {
-      const input = ref2.current;
-      if (!input) {
-        return;
-      }
-      if (typeof props.ref === "function") {
-        props.ref(input);
-      } else if (props.ref) {
-        props.ref.current = input;
-      }
-      return store.subscribe((state, key) => {
-        if (key === dispatchKey) {
-          return;
-        }
-        if (props.type === "checkbox" || props.type === "radio") {
-          const checked = toInputChecked(state[props.name]);
-          if (input.checked === checked) {
-            return;
-          }
-          input.checked = checked;
-        } else {
-          const value = toInputValue(state[props.name]);
-          if (input.value === value) {
-            return;
-          }
-          input.value = value;
-        }
-        const event = new Event("input", { bubbles: true });
-        input.dispatchEvent(event);
-      });
-    }, []);
-    return ref2;
-  }
   function toStateValue(value) {
-    if (typeof store.state[props.name] === "number") {
+    const selected = props.getter(store.state);
+    if (typeof selected === "number") {
       return Number(value);
     }
-    if (store.state[props.name] instanceof Date) {
+    if (selected instanceof Date) {
       return new Date(value);
     }
     return value;
   }
-  function createChangeEventHandler() {
-    return (e) => {
-      const target = e.target;
-      if (props.type === "checkbox") {
-        store.dispatch(
-          (state) => {
-            state[props.name] = target.checked;
-          },
-          {
-            key: dispatchKey
-          }
-        );
+  const inputProps = useStoreController(store, {
+    ref: props.ref,
+    onSubscribe: (state, element) => {
+      if ("checked" in element && (props.type === "checkbox" || props.type === "radio")) {
+        const checked = toInputChecked(props.getter(state));
+        if (element.checked === checked) {
+          return;
+        }
+        element.checked = checked;
       } else {
-        store.dispatch(
-          (state) => {
-            state[props.name] = toStateValue(target.value);
-          },
-          {
-            key: dispatchKey
-          }
-        );
+        const value = toInputValue(props.getter(state));
+        if (element.value === value) {
+          return;
+        }
+        element.value = value;
       }
-      props.onChange?.(e);
-    };
-  }
-  const dispatchKey = useId();
-  const ref = useSubscriptionRef();
-  const name = String(props.name);
-  const defaultValue = getDefaultValue();
-  const defaultChecked = getDefaultChecked();
-  const onChange = createChangeEventHandler();
-  return {
-    key: dispatchKey,
-    ref,
-    name,
-    defaultValue,
-    defaultChecked,
-    onChange
-  };
-}
-
-// src/use_store_input.tsx
-function useStoreInput(store) {
-  const input = useCallback(function Component(props) {
-    return /* @__PURE__ */ React.createElement(Input, { store, ...props });
-  }, []);
-  const select = useCallback(function Component(props) {
-    return /* @__PURE__ */ React.createElement(Select, { store, ...props });
-  }, []);
-  const textarea = useCallback(function Component(props) {
-    return /* @__PURE__ */ React.createElement(Textarea, { store, ...props });
-  }, []);
+      const event = new Event("input", { bubbles: true });
+      element.dispatchEvent(event);
+    },
+    onDispatch: (state, element) => {
+      if ("checked" in element && props.type === "checkbox") {
+        props.setter(state, element.checked);
+      } else {
+        props.setter(state, toStateValue(element.value));
+      }
+    }
+  });
   return {
-    input,
-    select,
-    textarea
+    ref: inputProps.ref,
+    dispatchKey: inputProps.dispatchKey,
+    defaultValue: getDefaultValue(),
+    defaultChecked: getDefaultChecked(),
+    onChange: (event) => {
+      inputProps.onChange();
+      props.onChange?.(event);
+    }
   };
 }
-function Input({
-  store,
-  ...props
-}) {
-  const storeProps = useStoreInputProps(store, props);
-  return /* @__PURE__ */ React.createElement("input", { ...props, ...storeProps });
-}
-function Select({
-  store,
-  ...props
-}) {
-  const storeProps = useStoreInputProps(store, props);
-  return /* @__PURE__ */ React.createElement("select", { ...props, ...storeProps });
-}
-function Textarea({
-  store,
-  ...props
-}) {
-  const storeProps = useStoreInputProps(store, props);
-  return /* @__PURE__ */ React.createElement("textarea", { ...props, ...storeProps });
-}
 export {
-  Input,
-  Select,
-  Textarea,
   useStoreInput
 };

package/dist/use_store_input_with_name.d.mts

@@ -0,0 +1,17 @@
+import * as React from 'react';
+import { Store } from './use_store.mjs';
+import { StoreInputProps } from './use_store_input.mjs';
+
+type Props<TInputElement, TState> = Omit<StoreInputProps<TInputElement, TState>, "getter" | "setter"> & Partial<Pick<StoreInputProps<TInputElement, TState>, "getter" | "setter">> & {
+    name?: keyof TState;
+};
+declare function useStoreInputWithName<TInputElement extends HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement, TState>(store: Store<TState>, props: Props<TInputElement, TState>): {
+    name: string | undefined;
+    ref: React.RefObject<TInputElement | null>;
+    dispatchKey: string;
+    defaultValue: string | number | readonly string[] | undefined;
+    defaultChecked: boolean | undefined;
+    onChange: (event: React.ChangeEvent<TInputElement>) => void;
+};
+
+export { useStoreInputWithName };

package/dist/use_store_input_with_name.d.ts

@@ -0,0 +1,17 @@
+import * as React from 'react';
+import { Store } from './use_store.js';
+import { StoreInputProps } from './use_store_input.js';
+
+type Props<TInputElement, TState> = Omit<StoreInputProps<TInputElement, TState>, "getter" | "setter"> & Partial<Pick<StoreInputProps<TInputElement, TState>, "getter" | "setter">> & {
+    name?: keyof TState;
+};
+declare function useStoreInputWithName<TInputElement extends HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement, TState>(store: Store<TState>, props: Props<TInputElement, TState>): {
+    name: string | undefined;
+    ref: React.RefObject<TInputElement | null>;
+    dispatchKey: string;
+    defaultValue: string | number | readonly string[] | undefined;
+    defaultChecked: boolean | undefined;
+    onChange: (event: React.ChangeEvent<TInputElement>) => void;
+};
+
+export { useStoreInputWithName };