namirasoft-site-react 1.4.166 → 1.4.167

package/src/components/NSRepeater.tsx

@@ -1,218 +1,224 @@
-import { Component, createRef, ReactNode } from 'react';
-import { INSBox } from './INSBox';
-
-export interface NSRepeaterProps<ItemType, ValueType>
-{
-	createItem: (gIndex: number, lIndex: number, ref: React.RefObject<ItemType>, onChange: () => void, onDelete: undefined | ((index: number) => void), visible: boolean, style: React.CSSProperties) => ReactNode;
-	updateItem: (item: ItemType, index: number, value: ValueType | null) => void;
-	getValue: (item: ItemType, checkError: boolean) => ValueType;
-	isEmpty: (item: ItemType, value: ValueType) => boolean;
-	onItemChanged?: () => void;
-	onValuesChanged?: (values: ValueType[]) => void;
-	min?: number;
-	max?: number;
-}
-
-export interface NSRepeaterState
-{
-	items: boolean[];
-}
-
-export class NSRepeater<ItemType, ValueType> extends Component<NSRepeaterProps<ItemType, ValueType>, NSRepeaterState> implements INSBox
-{
-	private Item_Refs: React.RefObject<ItemType>[] = [];
-	constructor(props: NSRepeaterProps<ItemType, ValueType>)
-	{
-		super(props);
-		this.state = { items: [] };
-		this.getCount = this.getCount.bind(this);
-		this.canDelete = this.canDelete.bind(this);
-		this.getGIndex = this.getGIndex.bind(this);
-		this.getIndex = this.getIndex.bind(this);
-		this.addItem = this.addItem.bind(this);
-		this.delItem = this.delItem.bind(this);
-		this.onChange = this.onChange.bind(this);
-		this.checkForNew = this.checkForNew.bind(this);
-
-		this.isEmpty = this.isEmpty.bind(this);
-		this.getError = this.getError.bind(this);
-		this.getValue = this.getValue.bind(this);
-		this.setValue = this.setValue.bind(this);
-	}
-	private getCount(): number
-	{
-		return this.state.items.filter(x => x).length;
-	}
-	private canDelete(gIndex: number)
-	{
-		if (this.Item_Refs.length > 0)
-		{
-			let count = this.getCount();
-			if (count <= (this.props.min ?? 1))
-				return false;
-			if (count === this.props.max)
-				return true;
-			if (gIndex === this.state.items.length - 1)
-				return false;
-			return true
-		}
-		return false;
-	}
-	private getGIndex(index: number): number
-	{
-		if (this.state.items.length === 0)
-			return 0;
-		for (let i = 0; i < this.state.items.length; i++)
-		{
-			if (this.state.items[i])
-			{
-				if (index === 0)
-					return i;
-				index--;
-			}
-		}
-		return this.state.items.length - 1;
-	}
-	private getIndex(gindex: number): number
-	{
-		if (gindex >= this.state.items.length)
-			throw new Error("GIndex out of bound: " + gindex);
-		let ans = -1;
-		for (let i = 0; i <= gindex; i++)
-			if (this.state.items[i])
-				ans++;
-		return ans;
-	}
-	private addItem(state: boolean = true)
-	{
-		if (!this.props.max || this.getCount() < this.props.max)
-		{
-			this.Item_Refs.push(createRef<ItemType>());
-			if (state)
-			{
-				let items = this.state.items;
-				items.push(true);
-				this.setState({ items }, () =>
-				{
-					if (this.props.onItemChanged)
-						this.props.onItemChanged();
-				});
-			}
-		}
-	}
-	private delItem(lIndex: number)
-	{
-		let gindex = this.getGIndex(lIndex);
-		if (this.canDelete(gindex))
-		{
-			let items = this.state.items;
-			items[gindex] = false;
-			this.setState({ items }, () =>
-			{
-				if (this.props.onItemChanged)
-					this.props.onItemChanged();
-				this.onChange();
-			});
-		}
-	}
-	private onChange()
-	{
-		if (this.props.onValuesChanged)
-			this.props.onValuesChanged(this.getValue(false));
-		this.checkForNew();
-	}
-	private checkForNew()
-	{
-		let length = this.state.items.filter(x => x).length;
-		if (length === 0)
-			this.addItem();
-		else
-		{
-			let last = this.Item_Refs.length - 1;
-			while (!this.state.items[last])
-				last--;
-			let item = this.Item_Refs[last].current;
-			if (item)
-				if (!this.props.isEmpty(item, this.props.getValue(item, false)))
-					this.addItem();
-		}
-	}
-	isEmpty(): boolean
-	{
-		return true;
-	}
-	getError(): string | null
-	{
-		return null;
-	}
-	getValue(checkError: boolean = true): ValueType[]
-	{
-		return this.state.items.map((exists, index) =>
-		{
-			if (exists)
-			{
-				let item = this.Item_Refs[index].current;
-				if (item)
-				{
-					let value = this.props.getValue(item, checkError);
-					if (!this.props.isEmpty(item, value))
-						return value;
-				}
-			}
-			return null
-		}).filter(x => x !== null) as ValueType[];
-	}
-	setValue(value: ValueType[], callback?: () => void): void
-	{
-		this.Item_Refs = [];
-		value.forEach(() =>
-		{
-			this.addItem(false);
-		})
-		let items = value.map(() => true);
-		this.setState({ items }, () =>
-		{
-			if (this.props.onItemChanged)
-				this.props.onItemChanged();
-			value.forEach((value, index) =>
-			{
-				let item = this.Item_Refs[index].current;
-				if (item)
-					this.props.updateItem(item, index, value)
-			});
-			this.onChange();
-			callback?.();
-		});
-	}
-	override componentDidMount()
-	{
-		let min = this.props.min ?? 1;
-		for (let i = 0; i < min; i++)
-			this.addItem();
-	}
-	override render()
-	{
-		let LIndex = -1;
-		return (
-			<>
-				{
-					this.Item_Refs.map((ref, GIndex) =>
-					{
-						if (this.state.items[GIndex])
-							LIndex++;
-						let visible = this.state.items[GIndex];
-						let style: { [name: string]: any } = {};
-						if (!visible)
-							style.display = "none";
-
-						let onDelete = undefined;
-						if (this.canDelete(GIndex))
-							onDelete = this.delItem;
-
-						return this.props.createItem(GIndex, LIndex, ref, this.onChange, onDelete, visible, style);
-					})
-				}
-			</>
-		);
-	}
+import { Component, createRef, ReactNode } from 'react';
+import { INSBox } from './INSBox';
+import { IBaseComponentProps } from '../main';
+
+export interface NSRepeaterProps<ItemType, ValueType> extends IBaseComponentProps
+{
+	createItem: (gIndex: number, lIndex: number, ref: React.RefObject<ItemType>, onChange: () => void, onDelete: undefined | ((lIndex: number) => void), visible: boolean, props: IBaseComponentProps) => ReactNode;
+	updateItem: (item: ItemType, index: number, value: ValueType | null) => void;
+	getValue: (item: ItemType, checkError: boolean) => ValueType | null;
+	isEmpty: (item: ItemType, value: ValueType | null) => boolean;
+	onItemChanged?: (repeater: NSRepeater<ItemType, ValueType>) => void;
+	onValuesChanged?: (repeater: NSRepeater<ItemType, ValueType>) => void;
+	min?: number;
+	max?: number;
+	ignoreItemsHavingError?: boolean;
+}
+
+export interface NSRepeaterState
+{
+	items: boolean[];
+}
+
+export class NSRepeater<ItemType, ValueType> extends Component<NSRepeaterProps<ItemType, ValueType>, NSRepeaterState> implements INSBox
+{
+	private Item_Refs: React.RefObject<ItemType>[] = [];
+	constructor(props: NSRepeaterProps<ItemType, ValueType>)
+	{
+		super(props);
+		this.state = { items: [] };
+		this.getCount = this.getCount.bind(this);
+		this.canDelete = this.canDelete.bind(this);
+		this.getGIndex = this.getGIndex.bind(this);
+		this.getIndex = this.getIndex.bind(this);
+		this.addItem = this.addItem.bind(this);
+		this.delItem = this.delItem.bind(this);
+		this.onChange = this.onChange.bind(this);
+		this.checkForNew = this.checkForNew.bind(this);
+
+		this.isEmpty = this.isEmpty.bind(this);
+		this.getError = this.getError.bind(this);
+		this.getValue = this.getValue.bind(this);
+		this.setValue = this.setValue.bind(this);
+	}
+	private getCount(): number
+	{
+		return this.state.items.filter(x => x).length;
+	}
+	private canDelete(gIndex: number)
+	{
+		if (this.Item_Refs.length > 0)
+		{
+			let count = this.getCount();
+			if (count <= (this.props.min ?? 1))
+				return false;
+			if (count === this.props.max)
+				return true;
+			if (gIndex === this.state.items.length - 1)
+				return false;
+			return true
+		}
+		return false;
+	}
+	private getGIndex(index: number): number
+	{
+		if (this.state.items.length === 0)
+			return 0;
+		for (let i = 0; i < this.state.items.length; i++)
+		{
+			if (this.state.items[i])
+			{
+				if (index === 0)
+					return i;
+				index--;
+			}
+		}
+		return this.state.items.length - 1;
+	}
+	private getIndex(gindex: number): number
+	{
+		if (gindex >= this.state.items.length)
+			throw new Error("GIndex out of bound: " + gindex);
+		let ans = -1;
+		for (let i = 0; i <= gindex; i++)
+			if (this.state.items[i])
+				ans++;
+		return ans;
+	}
+	private addItem(state: boolean = true)
+	{
+		if (!this.props.max || this.getCount() < this.props.max)
+		{
+			this.Item_Refs.push(createRef<ItemType>());
+			if (state)
+			{
+				let items = this.state.items;
+				items.push(true);
+				this.setState({ items }, () =>
+				{
+					this.props.onItemChanged?.(this);
+				});
+			}
+		}
+	}
+	private delItem(lIndex: number)
+	{
+		let gindex = this.getGIndex(lIndex);
+		if (this.canDelete(gindex))
+		{
+			let items = this.state.items;
+			items[gindex] = false;
+			this.setState({ items }, () =>
+			{
+				this.props.onItemChanged?.(this);
+				this.onChange();
+			});
+		}
+	}
+	private onChange()
+	{
+		this.props.onValuesChanged?.(this);
+		this.checkForNew();
+	}
+	private checkForNew()
+	{
+		let length = this.state.items.filter(x => x).length;
+		if (length === 0)
+			this.addItem();
+		else
+		{
+			let last = this.Item_Refs.length - 1;
+			while (!this.state.items[last])
+				last--;
+			let item = this.Item_Refs[last].current;
+			if (item)
+				if (!this.props.isEmpty(item, this.props.getValue(item, false)))
+					this.addItem();
+		}
+	}
+	isEmpty(): boolean
+	{
+		return true;
+	}
+	getError(): string | null
+	{
+		return null;
+	}
+	getValue(checkError: boolean = true): ValueType[]
+	{
+		return this.state.items.map((exists, index) =>
+		{
+			if (exists)
+			{
+				let item = this.Item_Refs[index].current;
+				if (item)
+				{
+					try
+					{
+						let value = this.props.getValue(item, checkError);
+						if (!this.props.isEmpty(item, value))
+							return value;
+					} catch (error)
+					{
+						if (this.props.ignoreItemsHavingError !== true)
+							throw error;
+					}
+				}
+			}
+			return null
+		}).filter(x => x !== null) as ValueType[];
+	}
+	setValue(value: ValueType[], callback?: () => void): void
+	{
+		this.Item_Refs = [];
+		value.forEach(() =>
+		{
+			this.addItem(false);
+		})
+		let items = value.map(() => true);
+		this.setState({ items }, () =>
+		{
+			this.props.onItemChanged?.(this);
+			value.forEach((value, index) =>
+			{
+				let item = this.Item_Refs[index].current;
+				if (item)
+					this.props.updateItem(item, index, value)
+			});
+			this.onChange();
+			callback?.();
+		});
+	}
+	override componentDidMount()
+	{
+		let min = this.props.min ?? 1;
+		for (let i = 0; i < min; i++)
+			this.addItem();
+	}
+	override render()
+	{
+		let LIndex = -1;
+		return (
+			<>
+				{
+					this.Item_Refs.map((ref, GIndex) =>
+					{
+						if (this.state.items[GIndex])
+							LIndex++;
+						let visible = this.state.items[GIndex];
+						let props = { ...this.props };
+						props.style = { ...props.style };
+						if (!visible)
+							props.style.display = "none";
+
+						let onDelete = undefined;
+						if (this.canDelete(GIndex))
+							onDelete = this.delItem;
+
+						return this.props.createItem(GIndex, LIndex, ref, this.onChange, onDelete, visible, props);
+					})
+				}
+			</>
+		);
+	}
 }

package/src/components/NSRepeaterNSBoxSchemaVariable.tsx

@@ -0,0 +1,90 @@
+import { Component, createRef } from 'react';
+import { INSBox } from './INSBox';
+import { NSBoxSchemaVariable } from './NSBoxSchemaVariable';
+import { BaseVariableSchema } from 'namirasoft-schema';
+import { NSRepeater } from './NSRepeater';
+import { IBaseComponentProps } from '../main';
+
+export interface NSRepeaterNSBoxSchemaVariableProps extends IBaseComponentProps
+{
+	onItemChanged?: (repeater: NSRepeaterNSBoxSchemaVariable) => void;
+	onValuesChanged?: (repeater: NSRepeaterNSBoxSchemaVariable) => void;
+	min?: number;
+	max?: number;
+	item_title: string;
+}
+
+export interface NSRepeaterNSBoxSchemaVariableState
+{
+	items: boolean[];
+}
+
+export class NSRepeaterNSBoxSchemaVariable extends Component<NSRepeaterNSBoxSchemaVariableProps, NSRepeaterNSBoxSchemaVariableState> implements INSBox
+{
+	private Repeater_Refs = createRef<NSRepeater<NSBoxSchemaVariable, BaseVariableSchema>>();
+	constructor(props: NSRepeaterNSBoxSchemaVariableProps)
+	{
+		super(props);
+		this.state = { items: [] };
+		this.isEmpty = this.isEmpty.bind(this);
+		this.getError = this.getError.bind(this);
+		this.getValue = this.getValue.bind(this);
+		this.setValue = this.setValue.bind(this);
+	}
+	isEmpty(): boolean
+	{
+		return this.Repeater_Refs.current?.isEmpty() ?? true;
+	}
+	getError(): string | null
+	{
+		return this.Repeater_Refs.current?.getError() ?? null;
+	}
+	getValue(checkError: boolean = true): BaseVariableSchema[] 
+	{
+		return (this.Repeater_Refs.current?.getValue(checkError) ?? []).filter(x => x) as BaseVariableSchema[];
+	}
+	setValue(value: BaseVariableSchema[], callback?: () => void): void
+	{
+		this.Repeater_Refs.current?.setValue(value, callback);
+	}
+	override render()
+	{
+		return <NSRepeater<NSBoxSchemaVariable, BaseVariableSchema>
+			ref={this.Repeater_Refs}
+			{...this.props}
+			ignoreItemsHavingError
+			createItem={(gIndex: number, lIndex: number, ref: React.RefObject<NSBoxSchemaVariable>, onChange: () => void, onDelete: undefined | ((lIndex: number) => void), _: boolean, props) =>
+			{
+				return <NSBoxSchemaVariable
+					ref={ref}
+					{...props}
+					key={"NSRepeaterNSBoxSchemaVariable_NSRepeater_item_" + gIndex}
+					required
+					title={`${this.props.item_title} ${(lIndex + 1)}`}
+					menu={{ builtin: { delete: { enabled: true, onDelete: () => { onDelete?.(lIndex) } } }, items: [] }}
+					onChanged={onChange}
+				/>
+			}}
+			updateItem={(item: NSBoxSchemaVariable, _: number, value: BaseVariableSchema | null) =>
+			{
+				item.setValue(value);
+			}}
+			getValue={(item: NSBoxSchemaVariable, checkError: boolean) =>
+			{
+				return item.getValue(checkError);
+			}}
+			isEmpty={(item: NSBoxSchemaVariable, value: BaseVariableSchema | null) =>
+			{
+				return item.isEmpty(value);
+			}}
+			onItemChanged={() =>
+			{
+				this.props.onItemChanged?.(this);
+			}}
+			onValuesChanged={() =>
+			{
+				this.props.onValuesChanged?.(this);
+			}}
+		/>;
+	}
+}

package/src/components/NSRow.module.css

@@ -1,18 +1,18 @@
-.ns_row {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    gap: 16px;
-    margin: 0;
-    justify-content: center;
-    width: max-content;
-    max-width: 100%;
-    width: 100%;
-}
-
-@media only screen and (min-width: 768px) {
-    .ns_row {
-        flex-direction: row;
-        flex-wrap: wrap;
-    }
+.ns_row {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 16px;
+    margin: 0;
+    justify-content: center;
+    width: max-content;
+    max-width: 100%;
+    width: 100%;
+}
+
+@media only screen and (min-width: 768px) {
+    .ns_row {
+        flex-direction: row;
+        flex-wrap: wrap;
+    }
 }

package/src/components/NSRow.tsx

@@ -1,19 +1,19 @@
-import { ReactNode } from "react";
-import Styles from './NSRow.module.css';
-import { IBaseComponentProps } from "../props/IBaseComponentProps";
-
-export interface NSRowProps extends IBaseComponentProps
-{
-    children: ReactNode;
-}
-export function NSRow(props: NSRowProps)
-{
-    return (
-        <div id={props.id}
-            className={`${Styles.ns_row} ${props.classList?.join(" ")}`}
-            style={props.style}
-        >
-            {props.children}
-        </div>
-    );
+import { ReactNode } from "react";
+import Styles from './NSRow.module.css';
+import { IBaseComponentProps } from "../props/IBaseComponentProps";
+
+export interface NSRowProps extends IBaseComponentProps
+{
+    children: ReactNode;
+}
+export function NSRow(props: NSRowProps)
+{
+    return (
+        <div id={props.id}
+            className={`${Styles.ns_row} ${props.classList?.join(" ")}`}
+            style={props.style}
+        >
+            {props.children}
+        </div>
+    );
 }

package/src/components/NSSection.module.css

@@ -1,5 +1,5 @@
-.ns_section {
-	background-repeat: no-repeat;
-	background-size: cover;
-	background-position: center;
+.ns_section {
+	background-repeat: no-repeat;
+	background-size: cover;
+	background-position: center;
 }

package/src/components/NSSection.tsx

@@ -1,21 +1,21 @@
-import { ReactNode } from "react";
-import Styles from './NSSection.module.css'
-import { IBaseComponentProps } from "../props/IBaseComponentProps";
-
-export interface NSSectionProps extends IBaseComponentProps
-{
-	children: ReactNode;
-}
-
-export function NSSection(props: NSSectionProps)
-{
-	return (
-		<section
-			id={props.id}
-			className={`container d-flex flex-wrap justify-content-center ${Styles.ns_section} ${props.classList?.join(" ")}`}
-			style={props.style}
-		>
-			{props.children}
-		</section>
-	);
+import { ReactNode } from "react";
+import Styles from './NSSection.module.css'
+import { IBaseComponentProps } from "../props/IBaseComponentProps";
+
+export interface NSSectionProps extends IBaseComponentProps
+{
+	children: ReactNode;
+}
+
+export function NSSection(props: NSSectionProps)
+{
+	return (
+		<section
+			id={props.id}
+			className={`container d-flex flex-wrap justify-content-center ${Styles.ns_section} ${props.classList?.join(" ")}`}
+			style={props.style}
+		>
+			{props.children}
+		</section>
+	);
 }