namirasoft-site-react 1.4.240 → 1.4.242

package/dist/components/NSBarTitle.js

@@ -1,12 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Fragment } from 'react/jsx-runtime';
 import Styles from './NSBarTitle.module.css';
+import { StringFormatter } from '../main';
 export function NSBarTitle(props) {
-    var _a;
-    let lines = ((_a = props.description) !== null && _a !== void 0 ? _a : "").split(/(\n|\\n|<br>|<br\s*\/>)/gm);
-    return (_jsxs("div", { className: "container", children: [_jsx("h1", { className: Styles.title, children: props.title }), props.description && lines &&
-                _jsx("p", { className: Styles.description, children: lines.map((line, index) => {
-                        return _jsxs(Fragment, { children: [line.trim(), index !== lines.length - 1 && _jsx("br", {})] }, `NSBarTitle_fragment_key_${index}`);
-                    }) })] }));
+    return (_jsxs("div", { className: "container", children: [_jsx("h1", { className: Styles.title, children: props.title }), props.description &&
+                _jsx("p", { className: Styles.description, children: StringFormatter.toHTML(props.description) })] }));
 }
 //# sourceMappingURL=NSBarTitle.js.map

package/dist/components/NSBarTitle.js.map

@@ -1 +1 @@
-{"version":3,"file":"NSBarTitle.js","sourceRoot":"","sources":["../../src/components/NSBarTitle.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAQ7C,MAAM,UAAU,UAAU,CAAC,KAAsB;;IAEhD,IAAI,KAAK,GAAG,CAAC,MAAA,KAAK,CAAC,WAAW,mCAAI,EAAE,CAAC,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACzE,OAAO,CACN,eAAK,SAAS,EAAC,WAAW,aACzB,aAAI,SAAS,EAAE,MAAM,CAAC,KAAK,YAAG,KAAK,CAAC,KAAK,GAAM,EAE9C,KAAK,CAAC,WAAW,IAAI,KAAK;gBAC1B,YAAG,SAAS,EAAE,MAAM,CAAC,WAAW,YAC/B,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;wBAEzB,OAAO,MAAC,QAAQ,eACd,IAAI,CAAC,IAAI,EAAE,EACX,KAAK,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,cAAM,KAFhB,2BAA2B,KAAK,EAAE,CAG7C,CAAC;oBACb,CAAC,CAAC,GACE,IAED,CACN,CAAC;AACH,CAAC"}
+{"version":3,"file":"NSBarTitle.js","sourceRoot":"","sources":["../../src/components/NSBarTitle.tsx"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAQ1C,MAAM,UAAU,UAAU,CAAC,KAAsB;IAEhD,OAAO,CACN,eAAK,SAAS,EAAC,WAAW,aACzB,aAAI,SAAS,EAAE,MAAM,CAAC,KAAK,YAAG,KAAK,CAAC,KAAK,GAAM,EAE9C,KAAK,CAAC,WAAW;gBACjB,YAAG,SAAS,EAAE,MAAM,CAAC,WAAW,YAC/B,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,GAEtC,IAEA,CACN,CAAC;AACH,CAAC"}

package/dist/formatter/StringFormatter.d.ts

@@ -8,6 +8,7 @@ export declare enum StringFormatterSizeType {
     Description = "500px"
 }
 export declare class StringFormatter extends BaseColumnFormatter {
+    static toHTML(value: string | null | undefined): string | (string | import("react/jsx-runtime").JSX.Element)[];
     private naming;
     constructor(width?: string, naming?: NamingConvention | null);
     format(value: any): any;

package/dist/formatter/StringFormatter.js

@@ -1,3 +1,4 @@
+import { jsx as _jsx } from "react/jsx-runtime";
 import { NamingConvention } from "namirasoft-core";
 import { BaseColumnFormatter } from "./BaseColumnFormatter";
 export var StringFormatterSizeType;
@@ -9,6 +10,20 @@ export var StringFormatterSizeType;
     StringFormatterSizeType["Description"] = "500px";
 })(StringFormatterSizeType || (StringFormatterSizeType = {}));
 export class StringFormatter extends BaseColumnFormatter {
+    static toHTML(value) {
+        var _a;
+        value = (_a = value === null || value === void 0 ? void 0 : value.trim()) !== null && _a !== void 0 ? _a : "";
+        let toks = value.split(/(\n|\\n|<br>|<br\s*\/>)/gm);
+        if (toks.length === 1)
+            return value;
+        let ans = [];
+        for (let i = 0; i < toks.length; i++) {
+            if (i > 0)
+                ans.push(_jsx("br", {}, i));
+            ans.push(toks[i].trim());
+        }
+        return ans;
+    }
     constructor(width = StringFormatterSizeType.Sentence, naming = null) {
         super();
         this.width = width;

package/dist/formatter/StringFormatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"StringFormatter.js","sourceRoot":"","sources":["../../src/formatter/StringFormatter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,CAAN,IAAY,uBAOX;AAPD,WAAY,uBAAuB;IAE/B,wCAAa,CAAA;IACb,6CAAkB,CAAA;IAClB,6CAAkB,CAAA;IAClB,6CAAkB,CAAA;IAClB,gDAAqB,CAAA;AACzB,CAAC,EAPW,uBAAuB,KAAvB,uBAAuB,QAOlC;AAED,MAAM,OAAO,eAAgB,SAAQ,mBAAmB;IAGpD,YAAY,QAAgB,uBAAuB,CAAC,QAAQ,EAAE,SAAkC,IAAI;QAEhG,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IACQ,MAAM,CAAC,KAAU;QAEtB,IAAI,IAAI,CAAC,MAAM;YACX,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9D,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ"}
+{"version":3,"file":"StringFormatter.js","sourceRoot":"","sources":["../../src/formatter/StringFormatter.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,CAAN,IAAY,uBAOX;AAPD,WAAY,uBAAuB;IAE/B,wCAAa,CAAA;IACb,6CAAkB,CAAA;IAClB,6CAAkB,CAAA;IAClB,6CAAkB,CAAA;IAClB,gDAAqB,CAAA;AACzB,CAAC,EAPW,uBAAuB,KAAvB,uBAAuB,QAOlC;AAED,MAAM,OAAO,eAAgB,SAAQ,mBAAmB;IAEpD,MAAM,CAAC,MAAM,CAAC,KAAgC;;QAE1C,KAAK,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,EAAE,mCAAI,EAAE,CAAC;QAC5B,IAAI,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;QACpD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YACjB,OAAO,KAAK,CAAC;QACjB,IAAI,GAAG,GAAG,EAAE,CAAC;QACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EACpC,CAAC;YACG,IAAI,CAAC,GAAG,CAAC;gBACL,GAAG,CAAC,IAAI,CAAC,eAAS,CAAC,CAAI,CAAC,CAAC;YAC7B,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7B,CAAC;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAED,YAAY,QAAgB,uBAAuB,CAAC,QAAQ,EAAE,SAAkC,IAAI;QAEhG,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IACQ,MAAM,CAAC,KAAU;QAEtB,IAAI,IAAI,CAAC,MAAM;YACX,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9D,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ"}

package/package.json

@@ -8,7 +8,7 @@
 	"framework": "npm",
 	"application": "package",
 	"private": false,
-	"version": "1.4.240",
+	"version": "1.4.242",
 	"author": "Amir Abolhasani",
 	"license": "MIT",
 	"main": "./dist/main.js",
@@ -34,9 +34,9 @@
 		"link-react": "^3.0.0",
 		"namirasoft-api-link": "^1.4.9",
 		"namirasoft-api-product": "^1.4.13",
-		"namirasoft-core": "^1.4.44",
+		"namirasoft-core": "^1.4.45",
 		"namirasoft-schema": "^1.4.22",
-		"namirasoft-site-map": "^1.4.11",
+		"namirasoft-site-map": "^1.4.12",
 		"os-browserify": "^0.3.0",
 		"path-browserify": "^1.0.1",
 		"react": "^18.3.1",

package/src/components/NSBarTitle.tsx

@@ -1,5 +1,5 @@
-import { Fragment } from 'react/jsx-runtime';
 import Styles from './NSBarTitle.module.css';
+import { StringFormatter } from '../main';
 
 export interface NSBarTitleProps 
 {
@@ -9,21 +9,15 @@ export interface NSBarTitleProps
 
 export function NSBarTitle(props: NSBarTitleProps)
 {
-	let lines = (props.description ?? "").split(/(\n|\\n|<br>|<br\s*\/>)/gm);
 	return (
 		<div className="container">
 			<h1 className={Styles.title}>{props.title}</h1>
 			{
-				props.description && lines &&
+				props.description &&
 				<p className={Styles.description}>{
-					lines.map((line, index) =>
-					{
-						return <Fragment key={`NSBarTitle_fragment_key_${index}`}>
-							{line.trim()}
-							{index !== lines.length - 1 && <br />}
-						</Fragment>;
-					})
-				}</p>
+					StringFormatter.toHTML(props.description)
+				}
+				</p>
 			}
 		</div>
 	);

package/src/formatter/{StringFormatter.ts → StringFormatter.tsx}

@@ -12,6 +12,21 @@ export enum StringFormatterSizeType
 
 export class StringFormatter extends BaseColumnFormatter
 {
+    static toHTML(value: string | null | undefined)
+    {
+        value = value?.trim() ?? "";
+        let toks = value.split(/(\n|\\n|<br>|<br\s*\/>)/gm);
+        if (toks.length === 1)
+            return value;
+        let ans = [];
+        for (let i = 0; i < toks.length; i++)
+        {
+            if (i > 0)
+                ans.push(<br key={i} />);
+            ans.push(toks[i].trim());
+        }
+        return ans;
+    }
     private naming: NamingConvention | null;
     constructor(width: string = StringFormatterSizeType.Sentence, naming: NamingConvention | null = null)
     {