namirasoft-site-react 1.4.134 → 1.4.136

package/src/components/NSBoxPhone.module.css

@@ -1,36 +1,36 @@
-.ns_container {
-	padding: 8px 32px 8px 12px;
-	height: 48px !important;
-	width: auto !important;
-	font-size: 16px;
-	font-weight: 400;
-	max-width: inherit;
-	background-size: 24px 24px;
-	padding: 0px;
-	margin: 0px;
-	display: flex;
-}
-
-.ns_input {
-	width: 100% !important;
-	height: 48px !important;
-	left: 0px;
-	border-radius: 8px 8px 8px 8px !important;
-	border: 1px solid rgba(0, 0, 0, 1) !important;
-}
-
-.ns_button {
-	border-radius: 8px 0px 0px 8px !important;
-	left: 0px;
-	border: 1px solid rgba(0, 0, 0, 1) !important;
-	/*  */
-	background-color: unset;
-}
-
-.ns_button>div {
-	background-color: unset !important;
-}
-
-.ns_dropdown {
-	width: 272px !important;
+.ns_box_phone_container {
+	padding: 8px 32px 8px 12px;
+	height: 48px !important;
+	width: auto !important;
+	font-size: 16px;
+	font-weight: 400;
+	max-width: inherit;
+	background-size: 24px 24px;
+	padding: 0px;
+	margin: 0px;
+	display: flex;
+}
+
+.ns_box_phone_input {
+	width: 100% !important;
+	height: 48px !important;
+	left: 0px;
+	border-radius: 8px 8px 8px 8px !important;
+	border: 1px solid rgba(0, 0, 0, 1) !important;
+}
+
+.ns_box_phone_button {
+	border-radius: 8px 0px 0px 8px !important;
+	left: 0px;
+	border: 1px solid rgba(0, 0, 0, 1) !important;
+	/*  */
+	background-color: unset;
+}
+
+.ns_box_phone_button>div {
+	background-color: unset !important;
+}
+
+.ns_box_phone_dropdown {
+	width: 272px !important;
 }

package/src/components/NSBoxPhone.tsx

@@ -1,117 +1,104 @@
-"use client";
-
-import React from "react";
-import StylesNSBox from "./NSBox.module.css";
-import Styles from "./NSBoxPhone.module.css";
-import "./NSBoxPhone.module.css";
-import PhoneInput from 'react-phone-input-2'
-import 'react-phone-input-2/lib/style.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 NSBoxPhoneProps extends IBaseComponentProps, IValidationProps, IValidationStringProps
-{
-	title: string;
-	placeholder?: string;
-	defaultValue?: string;
-	onChanged?: (e: NSBoxPhone, callback?: () => void) => void;
-	onClicked?: (e: NSBoxPhone) => void;
-}
-
-export interface NSBoxPhoneState
-{
-	value: string;
-	error?: string;
-}
-
-export class NSBoxPhone extends React.Component<NSBoxPhoneProps, NSBoxPhoneState>
-{
-	constructor(props: NSBoxPhoneProps)
-	{
-		super(props);
-		this.state = { value: props.defaultValue ?? "" };
-		this.setValue = this.setValue.bind(this);
-		this.getValue = this.getValue.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);
-			}
-		}
-
-		let value = this.state.value?.trim();
-		if (!value?.startsWith('+'))
-			value = '+' + value;
-		return value;
-	}
-	setValue(value: string, callback?: () => void): void 
-	{
-		this.setState({ value }, () =>
-		{
-			if (this.props.onChanged)
-				this.props.onChanged(this, callback);
-			else if (callback)
-				callback();
-		});
-	}
-
-	override render()
-	{
-		let menus = [];
-
-		if (!this.getError())
-			menus.push({
-				title: "Call",
-				icon: "https://static.namirasoft.com/image/concept/type/phone.png",
-				href: `tel:${this.state.value}`
-			});
-
-		return (
-			<>
-				<div id={this.props.id} 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} hideFullscreen />
-					</div>
-					<PhoneInput
-						value={this.state.value}
-						onChange={(value) => { this.setValue(value); }}
-						onClick={() => { if (this.props.onClicked) this.props.onClicked(this); }}
-						country={'us'}
-						containerClass={Styles.ns_container}
-						inputClass={Styles.ns_input}
-						buttonClass={Styles.ns_button}
-						enableSearch={true}
-						searchClass={Styles.ns_search}
-						dropdownClass={Styles.ns_dropdown}
-						placeholder={this.props.placeholder}
-						inputStyle={{
-							background: `url("https://static.namirasoft.com/image/concept/type/phone.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 Styles from "./NSBoxPhone.module.css";
+import "./NSBoxPhone.module.css";
+import PhoneInput from 'react-phone-input-2'
+import 'react-phone-input-2/lib/style.css'
+import { IBaseComponentProps } from "../props/IBaseComponentProps";
+import { IValidationProps } from "../props/IValidationProps";
+import { IValidationStringProps } from "../props/IValidationStringProps";
+import { Validator } from "../Validator";
+import { INSBoxBaseLayoutProps, NSBoxBaseLayout } from "./NSBoxBaseLayout";
+import { safeMenuMenuItem } from "./NSMenuButton";
+
+export interface NSBoxPhoneProps extends IBaseComponentProps, IValidationProps, IValidationStringProps, INSBoxBaseLayoutProps<string, NSBoxPhone>
+{ }
+
+export interface NSBoxPhoneState
+{
+	value: string;
+}
+
+export class NSBoxPhone extends React.Component<NSBoxPhoneProps, NSBoxPhoneState>
+{
+	NSBoxBaseLayout_Main = createRef<NSBoxBaseLayout>();
+	constructor(props: NSBoxPhoneProps)
+	{
+		super(props);
+		this.state = { value: props.defaultValue ?? "" };
+		this.setValue = this.setValue.bind(this);
+		this.getValue = this.getValue.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, () =>
+		{
+			let value = this.state.value?.trim();
+			if (!value?.startsWith('+'))
+				value = '+' + value;
+			return value;
+		});
+	}
+	setValue(value: string, callback?: () => void): void 
+	{
+		this.setState({ value }, () =>
+		{
+			if (this.props.onChanged)
+				this.props.onChanged(this, callback);
+			else if (callback)
+				callback();
+		});
+	}
+
+	override render()
+	{
+		let menu = safeMenuMenuItem(this.props, (items) =>
+		{
+			if (!this.getError())
+				items.push({
+					title: "Call",
+					icon: "https://static.namirasoft.com/image/concept/type/phone.png",
+					href: `tel:${this.state.value}`
+				});
+		});
+		menu.builtin.fullscreen = false;
+
+
+		return (
+			<NSBoxBaseLayout
+				ref={this.NSBoxBaseLayout_Main}
+				{...this.props}
+				getValue={() => this.state.value}
+				setValue={this.setValue}
+				menu={menu}
+			>
+				<PhoneInput
+					key={this.props.id}
+					value={this.state.value}
+					onChange={(value) => { this.setValue(value); }}
+					onClick={() => { if (this.props.onClicked) this.props.onClicked(this); }}
+					country={'us'}
+					containerClass={Styles.ns_box_phone_container}
+					inputClass={Styles.ns_box_phone_input}
+					buttonClass={Styles.ns_box_phone_button}
+					enableSearch={true}
+					searchClass={Styles.ns_box_phone_search}
+					dropdownClass={Styles.ns_box_phone_dropdown}
+					placeholder={this.props.placeholder}
+					inputStyle={{
+						background: `url("https://static.namirasoft.com/image/concept/type/phone.png") white no-repeat scroll center right 4px`,
+						backgroundSize: "24px"
+					}}
+				/>
+			</NSBoxBaseLayout>
+		);
+	}
 }

package/src/components/NSBoxRadio.module.css

@@ -1,70 +1,34 @@
-.ns_input_parent {
-    display: flex;
-    flex-direction: column;
-    width: fit-content;
-    color: #141B5C;
-    position: relative;
-    justify-content: center;
-    max-width: 272px;
-    width: 100%;
-    border: 1px solid rgba(0, 0, 0, 1) !important;
-    background-color: #fff;
-    border-radius: 8px;
-    cursor: pointer;
-}
-
-.ns_input_title {
-    font-size: 16px;
-    font-weight: 400;
-}
-
-.ns_checkbox_parent {
-    padding: 10px 12px 10px 12px;
-    font-size: 16px;
-    font-weight: 400;
-    position: relative;
-    width: 100%;
-    display: flex;
-    flex-direction: row;
-    justify-content: left;
-    align-items: center;
-    height: 48px;
-    gap: 5px;
-}
-
-.ns_input {
-    width: 16px;
-    height: 16px;
-    cursor: pointer;
-}
-
-.ns_input:focus-visible {
-    border-color: rgba(0, 0, 0, 1) !important;
-    outline: solid 1px #4096ff !important;
-}
-
-.ns_input:checked {
-    accent-color: #141B5C;
-}
-
-.ns_checkbox_parent label {
-    cursor: pointer;
-    color: #141B5C;
-    font-size: 16px;
-    font-weight: 300;
-    font-family: inherit;
-}
-
-@media only screen and (min-width: 380px) {
-    .ns_checkbox_parent {
-        width: 100%;
-    }
-}
-
-.ns_input_transparent {
-    position: absolute;
-    z-index: 1;
-    width: 100%;
-    height: 100%;
-    background: transparent;
+.ns_box_radio_label {
+    width: 100%;
+    height: 48px;
+    padding: 10px 12px 10px 12px;
+    background-color: #fff;
+    color: #141B5C;
+    border-radius: 8px;
+    border: 1px solid rgba(0, 0, 0, 1) !important;
+    font-size: 16px;
+    font-weight: 400;
+    font-family: inherit;
+    cursor: pointer;
+    position: relative;
+    display: flex;
+    flex-direction: row;
+    justify-content: left;
+    align-items: center;
+    gap: 4px;
+}
+
+.ns_box_radio_input {
+    width: 24px;
+    height: 24px;
+    cursor: pointer;
+}
+
+.ns_box_radio_input:focus-visible {
+    border-color: rgba(0, 0, 0, 1) !important;
+    outline: solid 1px #4096ff !important;
+}
+
+.ns_box_radio_input:checked {
+    accent-color: #141B5C;
 }

package/src/components/NSBoxRadio.tsx

@@ -1,108 +1,98 @@
-import React from "react";
-import Styles from "./NSBoxRadio.module.css";
-// import StylesNSBox from "./NSBox.module.css";
-import { IBaseComponentProps } from "../props/IBaseComponentProps";
-import { IValidationProps } from "../props/IValidationProps";
-import { IValidationStringProps } from "../props/IValidationStringProps";
-import { NSLabelErrorNotifier } from "./NSLabelErrorNotifier";
-
-export interface NSBoxRadioProps extends IBaseComponentProps, IValidationProps, IValidationStringProps
-{
-    title: string;
-    placeholder?: string;
-    defaultValue?: boolean;
-    isSelected?: boolean;
-    onChanged?: (e: NSBoxRadio, callback?: () => void) => void;
-    onClicked?: () => void;
-}
-
-export interface NSBoxRadioState
-{
-    value: boolean;
-    error?: string;
-}
-
-export class NSBoxRadio extends React.Component<NSBoxRadioProps, NSBoxRadioState>
-{
-    constructor(props: NSBoxRadioProps)
-    {
-        super(props);
-        this.state = { value: props.defaultValue ?? false };
-        this.getValue = this.getValue.bind(this);
-        this.setValue = this.setValue.bind(this);
-        this.onChanged = this.onChanged.bind(this);
-    }
-
-    getError(): string | null
-    {
-        return null;
-    }
-
-    getValue(checkError: boolean = true): boolean
-    {
-        if (checkError)
-        {
-            let error = this.getError();
-            if (error)
-            {
-                this.setState({ error });
-                throw new Error(error);
-            }
-        }
-        return this.state.value;
-    }
-
-    setValue(value: boolean, 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.checked);
-        //todo: onClicked should call here or pass as attribute to input element -> line: 99 ?
-        if (this.props.onClicked)
-            this.props.onClicked();
-    }
-
-    override componentDidUpdate(prevProps: NSBoxRadioProps)
-    {
-        if (prevProps.isSelected !== this.props.isSelected)
-        {
-            this.setValue(this.props.isSelected ?? false);
-        }
-    }
-
-    override render()
-    {
-        return (
-            <>
-                <div className={`${Styles.ns_input_parent} ${this.props.classList?.join(" ")}`} style={this.props.style ?? {}}>
-                    <label htmlFor={this.props.id}>
-                        <div className={Styles.ns_checkbox_parent} >
-                            <input
-                                id={this.props.id}
-                                type="radio"
-                                name={this.props.name}
-                                className={Styles.ns_input}
-                                checked={this.state.value}
-                                onChange={this.onChanged}
-                            // onClick={this.props.onClicked}
-                            />
-                            <span className={Styles.ns_input_title}>
-                                {this.props.required && <span style={{ color: "red" }} >*</span>} {this.props.title}
-                            </span>
-                        </div>
-                    </label>
-                    <NSLabelErrorNotifier error={this.state.error} clearError={() => this.setState({ error: "" })} />
-                </div>
-            </>
-        );
-    }
+import React, { createRef } from "react";
+import Styles from "./NSBoxRadio.module.css";
+import { IBaseComponentProps } from "../props/IBaseComponentProps";
+import { IValidationProps } from "../props/IValidationProps";
+import { IValidationStringProps } from "../props/IValidationStringProps";
+import { safeMenuMenuItem } from "./NSMenuButton";
+import { INSBoxBaseLayoutProps, NSBoxBaseLayout } from "./NSBoxBaseLayout";
+
+export interface NSBoxRadioProps extends IBaseComponentProps, IValidationProps, IValidationStringProps, INSBoxBaseLayoutProps<boolean, NSBoxRadio>
+{
+	checked?: boolean;
+}
+
+export interface NSBoxRadioState
+{
+	value: boolean;
+}
+
+export class NSBoxRadio extends React.Component<NSBoxRadioProps, NSBoxRadioState>
+{
+	NSBoxBaseLayout_Main = createRef<NSBoxBaseLayout>();
+	constructor(props: NSBoxRadioProps)
+	{
+		super(props);
+		this.state = { value: props.defaultValue ?? false };
+		this.getValue = this.getValue.bind(this);
+		this.setValue = this.setValue.bind(this);
+		this.onChanged = this.onChanged.bind(this);
+	}
+
+	getError(): string | null
+	{
+		return null;
+	}
+
+	getValue(checkError: boolean = true): boolean
+	{
+		return NSBoxBaseLayout.checkGetValue(this, checkError, () => this.state.value);
+	}
+
+	setValue(value: boolean, 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.checked);
+	}
+
+	override componentDidUpdate(prevProps: NSBoxRadioProps)
+	{
+		if (prevProps.checked !== this.props.checked)
+		{
+			this.setValue(this.props.checked ?? false);
+		}
+	}
+
+	override render()
+	{
+		let menu = safeMenuMenuItem(this.props, () => { });
+		menu.builtin.copy = false;
+		menu.builtin.fullscreen = false;
+
+		return (
+			< NSBoxBaseLayout
+				ref={this.NSBoxBaseLayout_Main}
+				{...this.props}
+				getValue={() => ""
+				}
+				setValue={() => { }}
+				menu={menu}
+			>
+				{/*this.props.title*/}
+				<label className={`ns-font-16-normal ${Styles.ns_box_radio_label}`} htmlFor={this.props.name}>
+					<input
+						id={this.props.id}
+						name={this.props.name}
+						type="radio"
+						className={Styles.ns_box_radio_input}
+						checked={this.state.value}
+						onChange={this.onChanged}
+						onClick={() => { if (this.props.onClicked) this.props.onClicked(this); }}
+					/>
+					<span style={{ width: "0px" }}></span>
+					{this.props.hideHeader && this.props.required && <span style={{ color: "red" }}>*</span>}
+					{this.props.title}
+				</label>
+			</NSBoxBaseLayout >
+		);
+	}
 }