namirasoft-site-react 1.4.134 → 1.4.136

package/src/components/NSBoxInteger.tsx

@@ -1,105 +1,89 @@
-"use client";
-
-import React from "react";
-import StylesNSBox from "./NSBox.module.css";
-import { IBaseComponentProps } from "../props/IBaseComponentProps";
-import { IValidationNumberProps } from "../props/IValidationNumberProps";
-import { IValidationProps } from "../props/IValidationProps";
-import { Validator } from "../Validator";
-import { NSLabelErrorNotifier } from "./NSLabelErrorNotifier";
-import { NSMenuButton } from "./NSMenuButton";
-
-export interface NSBoxIntegerProps extends IBaseComponentProps, IValidationProps, IValidationNumberProps
-{
-	title: string;
-	placeholder?: string;
-	defaultValue?: number;
-	onChanged?: (e: NSBoxInteger, callback?: () => void) => void;
-	onClicked?: (e: NSBoxInteger) => void;
-	min?: number;
-	max?: number;
-}
-
-export interface NSBoxIntegerState
-{
-	value?: number;
-	error?: string;
-}
-
-export class NSBoxInteger extends React.Component<NSBoxIntegerProps, NSBoxIntegerState>
-{
-	constructor(props: NSBoxIntegerProps)
-	{
-		super(props);
-		this.state = { value: props.defaultValue };
-		this.getValue = this.getValue.bind(this);
-		this.setValue = this.setValue.bind(this);
-		this.onChanged = this.onChanged.bind(this);
-	}
-	getError(): string | null
-	{
-		return (
-			Validator.getError(this.props.title, this.state.value, this.props) ||
-			Validator.getErrorNumber(this.props.title, this.state.value, this.props)
-		);
-	}
-	getValue(checkError: boolean = true): number | undefined
-	{
-		if (checkError)
-		{
-			let error = this.getError();
-			if (error)
-			{
-				this.setState({ error });
-				throw new Error(error);
-			}
-		}
-		return this.state.value;
-	}
-	setValue(value: number | undefined, callback?: () => void): void
-	{
-		this.setState({ value }, () =>
-		{
-			if (this.props.onChanged)
-				this.props.onChanged(this, callback);
-			else if (callback)
-				callback();
-		});
-	}
-	private onChanged(e: React.ChangeEvent<HTMLInputElement>): void
-	{
-		this.setValue(parseInt(e.target.value));
-	}
-	override render()
-	{
-		return (
-			<>
-				<div className={`${StylesNSBox.ns_input_parent} ${this.props.classList?.join(" ")}`} style={this.props.style ?? {}}>
-					<div className={`${StylesNSBox.ns_input_bar}`}>
-						<span className={StylesNSBox.ns_input_title}>
-							{this.props.required && <span style={{ color: "red" }}>*</span>} {this.props.title}
-						</span>
-						<NSMenuButton value={this.state.value?.toLocaleString() ?? ""} setValue={() => { }} hideFullscreen />
-					</div>
-					<input
-						id={this.props.id}
-						name={this.props.name}
-						type="number"
-						min={this.props.min}
-						max={this.props.max}
-						className={StylesNSBox.ns_input}
-						placeholder={this.props.placeholder}
-						value={this.state.value}
-						onChange={this.onChanged}
-						onClick={() => { if (this.props.onClicked) this.props.onClicked(this); }}
-						style={{
-							background: `url("https://static.namirasoft.com/image/concept/type/integer.png") white no-repeat scroll center right 4px`,
-							backgroundSize: "24px"
-						}}
-					/>
-					<NSLabelErrorNotifier error={this.state.error} clearError={() => this.setState({ error: "" })} />
-				</div>
-			</>
-		);
-	}
+"use client";
+
+import React, { createRef } from "react";
+import StylesNSBox from "./NSBox.module.css";
+import { IBaseComponentProps } from "../props/IBaseComponentProps";
+import { IValidationNumberProps } from "../props/IValidationNumberProps";
+import { IValidationProps } from "../props/IValidationProps";
+import { Validator } from "../Validator";
+import { safeMenuMenuItem } from "./NSMenuButton";
+import { INSBoxBaseLayoutProps, NSBoxBaseLayout } from "./NSBoxBaseLayout";
+
+export interface NSBoxIntegerProps extends IBaseComponentProps, IValidationProps, IValidationNumberProps, INSBoxBaseLayoutProps<number, NSBoxInteger>
+{
+}
+
+export interface NSBoxIntegerState
+{
+	value: number;
+}
+
+export class NSBoxInteger extends React.Component<NSBoxIntegerProps, NSBoxIntegerState>
+{
+	NSBoxBaseLayout_Main = createRef<NSBoxBaseLayout>();
+	constructor(props: NSBoxIntegerProps)
+	{
+		super(props);
+		this.state = { value: props.defaultValue ?? 0 };
+		this.getValue = this.getValue.bind(this);
+		this.setValue = this.setValue.bind(this);
+		this.onChanged = this.onChanged.bind(this);
+	}
+	getError(): string | null
+	{
+		return (
+			Validator.getError(this.props.title, this.state.value, this.props) ||
+			Validator.getErrorNumber(this.props.title, this.state.value, this.props)
+		);
+	}
+	getValue(checkError: boolean = true): number 
+	{
+		return NSBoxBaseLayout.checkGetValue(this, checkError, () => this.state.value);
+	}
+	setValue(value: number, callback?: () => void): void
+	{
+		this.setState({ value }, () =>
+		{
+			if (this.props.onChanged)
+				this.props.onChanged(this, callback);
+			else if (callback)
+				callback();
+		});
+	}
+	private onChanged(e: React.ChangeEvent<HTMLInputElement>): void
+	{
+		this.setValue(parseInt(e.target.value));
+	}
+	override render()
+	{
+		let menu = safeMenuMenuItem(this.props, () => { });
+		menu.builtin.fullscreen = false;
+
+		return (
+			<NSBoxBaseLayout
+				ref={this.NSBoxBaseLayout_Main}
+				{...this.props}
+				getValue={() => this.state.value?.toLocaleString() ?? ""}
+				setValue={() => { }}
+				menu={menu}
+			>
+				<input
+					id={this.props.id}
+					name={this.props.name}
+					type="number"
+					className={StylesNSBox.ns_box_input}
+					placeholder={this.props.placeholder}
+					value={this.state.value}
+					onChange={this.onChanged}
+					onClick={() => { if (this.props.onClicked) this.props.onClicked(this); }}
+					min={this.props.min}
+					max={this.props.max}
+					style={{
+						background: `url("https://static.namirasoft.com/image/concept/type/integer.png") white no-repeat scroll center right 4px`,
+						backgroundSize: "24px"
+					}}
+				/>
+			</NSBoxBaseLayout>
+		);
+	}
 }

package/src/components/NSBoxMoney.tsx

@@ -1,103 +1,88 @@
-"use client";
-
-import React from "react";
-import StylesNSBox from "./NSBox.module.css";
-import { IBaseComponentProps } from "../props/IBaseComponentProps";
-import { IValidationProps } from "../props/IValidationProps";
-import { IValidationNumberProps } from "../props/IValidationNumberProps";
-import { Validator } from "../Validator";
-import { NSLabelErrorNotifier } from "./NSLabelErrorNotifier";
-import { NSMenuButton } from "./NSMenuButton";
-
-export interface NSBoxMoneyProps extends IBaseComponentProps, IValidationProps, IValidationNumberProps 
-{
-	title: string;
-	placeholder?: string;
-	defaultValue?: number;
-	onChanged?: (e: NSBoxMoney, callback?: () => void) => void;
-	onClicked?: (e: NSBoxMoney) => void;
-}
-
-export interface NSBoxMoneyState
-{
-	value?: number;
-	error?: string;
-}
-
-export class NSBoxMoney extends React.Component<NSBoxMoneyProps, NSBoxMoneyState>
-{
-	constructor(props: NSBoxMoneyProps)
-	{
-		super(props);
-		this.state = { value: props.defaultValue };
-		this.setValue = this.setValue.bind(this);
-		this.getValue = this.getValue.bind(this);
-		this.onChanged = this.onChanged.bind(this);
-	}
-	getError(): string | null
-	{
-		return (
-			Validator.getError(this.props.title, this.state.value, this.props) ||
-			Validator.getErrorNumber(this.props.title, this.state.value, this.props)
-		);
-	}
-	getValue(checkError: boolean = true): number | undefined
-	{
-		if (checkError)
-		{
-			let error = this.getError();
-			if (error)
-			{
-				this.setState({ error });
-				throw new Error(error);
-			}
-		}
-		return this.state.value;
-	}
-	setValue(value: number | undefined, callback?: () => void): void
-	{
-		this.setState({ value }, () =>
-		{
-			if (this.props.onChanged)
-				this.props.onChanged(this, callback);
-			else if (callback)
-				callback();
-		});
-	}
-	private onChanged(e: React.ChangeEvent<HTMLInputElement>): void
-	{
-		this.setValue(parseFloat(e.target.value));
-	}
-	override render()
-	{
-		return (
-			<>
-				<div className={`${StylesNSBox.ns_input_parent} ${this.props.classList?.join(" ")}`} style={this.props.style ?? {}}>
-					<div className={`${StylesNSBox.ns_input_bar}`}>
-						<span className={StylesNSBox.ns_input_title}>
-							{this.props.required && <span style={{ color: "red" }}>*</span>} {this.props.title}
-						</span>
-						<NSMenuButton value={this.state.value?.toLocaleString() ?? ""} setValue={() => { }} hideFullscreen />
-					</div>
-					<input
-						id={this.props.id}
-						name={this.props.name}
-						type="number"
-						className={StylesNSBox.ns_input}
-						placeholder={this.props.placeholder}
-						value={this.state.value}
-						step="0.01"
-						min="0"
-						onChange={this.onChanged}
-						onClick={() => { if (this.props.onClicked) this.props.onClicked(this); }}
-						style={{
-							background: `url("https://static.namirasoft.com/image/concept/type/price.png") white no-repeat scroll center right 4px`,
-							backgroundSize: "24px"
-						}}
-					/>
-					<NSLabelErrorNotifier error={this.state.error} clearError={() => this.setState({ error: "" })} />
-				</div>
-			</>
-		);
-	}
+"use client";
+
+import React, { createRef } from "react";
+import StylesNSBox from "./NSBox.module.css";
+import { IBaseComponentProps } from "../props/IBaseComponentProps";
+import { IValidationProps } from "../props/IValidationProps";
+import { IValidationNumberProps } from "../props/IValidationNumberProps";
+import { Validator } from "../Validator";
+import { safeMenuMenuItem } from "./NSMenuButton";
+import { INSBoxBaseLayoutProps, NSBoxBaseLayout } from "./NSBoxBaseLayout";
+
+export interface NSBoxMoneyProps extends IBaseComponentProps, IValidationProps, IValidationNumberProps, INSBoxBaseLayoutProps<number, NSBoxMoney>
+{ }
+
+export interface NSBoxMoneyState
+{
+	value?: number;
+}
+
+export class NSBoxMoney extends React.Component<NSBoxMoneyProps, NSBoxMoneyState>
+{
+	NSBoxBaseLayout_Main = createRef<NSBoxBaseLayout>();
+	constructor(props: NSBoxMoneyProps)
+	{
+		super(props);
+		this.state = { value: props.defaultValue };
+		this.setValue = this.setValue.bind(this);
+		this.getValue = this.getValue.bind(this);
+		this.onChanged = this.onChanged.bind(this);
+	}
+	getError(): string | null
+	{
+		return (
+			Validator.getError(this.props.title, this.state.value, this.props) ||
+			Validator.getErrorNumber(this.props.title, this.state.value, this.props)
+		);
+	}
+	getValue(checkError: boolean = true): number | undefined
+	{
+		return NSBoxBaseLayout.checkGetValue(this, checkError, () => this.state.value);
+	}
+	setValue(value: number | undefined, callback?: () => void): void
+	{
+		this.setState({ value }, () =>
+		{
+			if (this.props.onChanged)
+				this.props.onChanged(this, callback);
+			else if (callback)
+				callback();
+		});
+	}
+	private onChanged(e: React.ChangeEvent<HTMLInputElement>): void
+	{
+		this.setValue(parseFloat(e.target.value));
+	}
+	override render()
+	{
+		let menu = safeMenuMenuItem(this.props, () => { });
+		menu.builtin.fullscreen = false;
+
+		return (
+			<NSBoxBaseLayout
+				ref={this.NSBoxBaseLayout_Main}
+				{...this.props}
+				getValue={() => this.state.value?.toLocaleString() ?? ""}
+				setValue={() => { }}
+				menu={menu}
+			>
+				<input
+					id={this.props.id}
+					name={this.props.name}
+					type="number"
+					className={StylesNSBox.ns_box_input}
+					placeholder={this.props.placeholder}
+					value={this.state.value}
+					onChange={this.onChanged}
+					onClick={() => { if (this.props.onClicked) this.props.onClicked(this); }}
+					step="0.01"
+					min="0"
+					style={{
+						background: `url("https://static.namirasoft.com/image/concept/type/price.png") white no-repeat scroll center right 4px`,
+						backgroundSize: "24px"
+					}}
+				/>
+			</NSBoxBaseLayout>
+		);
+	}
 }

package/src/components/NSBoxPassword.tsx

@@ -1,112 +1,98 @@
-"use client";
-
-import React from "react";
-import StylesNSBox from "./NSBox.module.css";
-import { IBaseComponentProps } from "../props/IBaseComponentProps";
-import { IValidationProps } from "../props/IValidationProps";
-import { IValidationStringProps } from "../props/IValidationStringProps";
-import { Validator } from "../Validator";
-import { NSLabelErrorNotifier } from "./NSLabelErrorNotifier";
-import { NSMenuButton } from "./NSMenuButton";
-
-export interface NSBoxPasswordProps extends IBaseComponentProps, IValidationProps, IValidationStringProps
-{
-	title: string;
-	placeholder?: string;
-	defaultValue?: string;
-	onChanged?: (e: NSBoxPassword, callback?: () => void) => void;
-	onClicked?: (e: NSBoxPassword) => void;
-}
-
-export interface NSBoxPasswordState 
-{
-	value: string;
-	error?: string;
-	show: boolean;
-}
-
-export class NSBoxPassword extends React.Component<NSBoxPasswordProps, NSBoxPasswordState>
-{
-	constructor(props: NSBoxPasswordProps)
-	{
-		super(props);
-		this.state = { value: props.defaultValue ?? "", show: false };
-		this.getValue = this.getValue.bind(this);
-		this.setValue = this.setValue.bind(this);
-		this.onChanged = this.onChanged.bind(this);
-	}
-	getError(): string | null
-	{
-		return (
-			Validator.getError(this.props.title, this.state.value, this.props) ||
-			Validator.getErrorString(this.props.title, this.state.value, this.props)
-		);
-	}
-	getValue(checkError: boolean = true): string
-	{
-		if (checkError)
-		{
-			let error = this.getError();
-			if (error)
-			{
-				this.setState({ error });
-				throw new Error(error);
-			}
-		}
-		return this.state.value;
-	}
-	setValue(value: string, callback?: () => void): void
-	{
-		this.setState({ value }, () =>
-		{
-			if (this.props.onChanged)
-				this.props.onChanged(this, callback);
-			else if (callback)
-				callback();
-		});
-	}
-	private onChanged(e: React.ChangeEvent<HTMLInputElement>): void
-	{
-		this.setValue(e.target.value);
-	}
-	override render()
-	{
-		let menus = [];
-		menus.push({
-			title: this.state.show ? "Hide Password" : "Show Password",
-			icon: this.state.show ? "https://static.namirasoft.com/image/concept/password/hide.png" : "https://static.namirasoft.com/image/concept/password/show.png",
-			onClick: () =>
-			{
-				this.setState({ show: !this.state.show });
-			}
-		});
-
-		return (
-			<>
-				<div className={`${StylesNSBox.ns_input_parent} ${this.props.classList?.join(" ")}`} style={this.props.style ?? {}}>
-					<div className={`${StylesNSBox.ns_input_bar}`}>
-						<span className={StylesNSBox.ns_input_title}>
-							{this.props.required && <span style={{ color: "red" }}>*</span>} {this.props.title}
-						</span>
-						<NSMenuButton value={this.state.value} setValue={this.setValue} menus={menus} hideCopy hideFullscreen />
-					</div>
-					<input
-						id={this.props.id}
-						name={this.props.name}
-						type={this.state.show ? "text" : "password"}
-						className={StylesNSBox.ns_input}
-						placeholder={this.props.placeholder}
-						value={this.state.value}
-						onChange={this.onChanged}
-						onClick={() => { if (this.props.onClicked) this.props.onClicked(this); }}
-						style={{
-							background: `url("https://static.namirasoft.com/image/concept/type/password.png") white no-repeat scroll center right 4px`,
-							backgroundSize: "24px"
-						}}
-					/>
-					<NSLabelErrorNotifier error={this.state.error} clearError={() => this.setState({ error: "" })} />
-				</div>
-			</>
-		);
-	}
+"use client";
+
+import React, { createRef } from "react";
+import StylesNSBox from "./NSBox.module.css";
+import { IBaseComponentProps } from "../props/IBaseComponentProps";
+import { IValidationProps } from "../props/IValidationProps";
+import { IValidationStringProps } from "../props/IValidationStringProps";
+import { Validator } from "../Validator";
+import { safeMenuMenuItem } from "./NSMenuButton";
+import { INSBoxBaseLayoutProps, NSBoxBaseLayout } from "./NSBoxBaseLayout";
+
+export interface NSBoxPasswordProps extends IBaseComponentProps, IValidationProps, IValidationStringProps, INSBoxBaseLayoutProps<string, NSBoxPassword>
+{ }
+
+export interface NSBoxPasswordState 
+{
+	value: string;
+	show: boolean;
+}
+
+export class NSBoxPassword extends React.Component<NSBoxPasswordProps, NSBoxPasswordState>
+{
+	NSBoxBaseLayout_Main = createRef<NSBoxBaseLayout>();
+	constructor(props: NSBoxPasswordProps)
+	{
+		super(props);
+		this.state = { value: props.defaultValue ?? "", show: false };
+		this.getValue = this.getValue.bind(this);
+		this.setValue = this.setValue.bind(this);
+		this.onChanged = this.onChanged.bind(this);
+	}
+	getError(): string | null
+	{
+		return (
+			Validator.getError(this.props.title, this.state.value, this.props) ||
+			Validator.getErrorString(this.props.title, this.state.value, this.props)
+		);
+	}
+	getValue(checkError: boolean = true): string
+	{
+		return NSBoxBaseLayout.checkGetValue(this, checkError, () => this.state.value);
+	}
+	setValue(value: string, callback?: () => void): void
+	{
+		this.setState({ value }, () =>
+		{
+			if (this.props.onChanged)
+				this.props.onChanged(this, callback);
+			else if (callback)
+				callback();
+		});
+	}
+	private onChanged(e: React.ChangeEvent<HTMLInputElement>): void
+	{
+		this.setValue(e.target.value);
+	}
+	override render()
+	{
+		let menu = safeMenuMenuItem(this.props, (items) =>
+		{
+			items.push({
+				title: this.state.show ? "Hide Password" : "Show Password",
+				icon: this.state.show ? "https://static.namirasoft.com/image/concept/password/hide.png" : "https://static.namirasoft.com/image/concept/password/show.png",
+				onClick: () =>
+				{
+					this.setState({ show: !this.state.show });
+				}
+			});
+		});
+		menu.builtin.copy = false;
+		menu.builtin.fullscreen = false;
+
+		return (
+			<NSBoxBaseLayout
+				ref={this.NSBoxBaseLayout_Main}
+				{...this.props}
+				getValue={() => this.state.value}
+				setValue={this.setValue}
+				menu={menu}
+			>
+				<input
+					id={this.props.id}
+					name={this.props.name}
+					type={this.state.show ? "text" : "password"}
+					className={StylesNSBox.ns_box_input}
+					placeholder={this.props.placeholder}
+					value={this.state.value}
+					onChange={this.onChanged}
+					onClick={() => { if (this.props.onClicked) this.props.onClicked(this); }}
+					style={{
+						background: `url("https://static.namirasoft.com/image/concept/type/password.png") white no-repeat scroll center right 4px`,
+						backgroundSize: "24px"
+					}}
+				/>
+			</NSBoxBaseLayout>
+		);
+	}
 }