@etsoo/shared 1.0.83 → 1.0.84

package/README.md

@@ -95,8 +95,6 @@ DOM/window related utilities
 |isJSONContentType|Is JSON content type|
 |mergeFormData|Merge form data to primary one|
 |mergeURLSearchParams|Merge URL search parameters|
-|saveCountry|Save country name|
-|saveCulture|Save culture name|
 |setFocus|Set HTML element focus by name|
 
 ## ExtendUtils

package/lib/cjs/DomUtils.d.ts

@@ -8,11 +8,11 @@ export declare namespace DomUtils {
     /**
      * Language cache parameter name
      */
-    const Culture = "culture";
+    const CultureField = "EtsooCulture";
     /**
      * Country cache parameter name
      */
-    const Country = "country";
+    const CountryField = "EtsooCountry";
     /**
      * Clear form data
      * @param data Form data
@@ -94,16 +94,6 @@ export declare namespace DomUtils {
      * @param data New simple object data to merge
      */
     function mergeURLSearchParams(base: URLSearchParams, data: DataTypes.SimpleObject): URLSearchParams;
-    /**
-     * Save country name
-     * @param country Country name
-     */
-    function saveCountry(country: string): void;
-    /**
-     * Save culture name
-     * @param culture Culture name
-     */
-    function saveCulture(culture: string): void;
     /**
      * Set HTML element focus by name
      * @param name Element name or first collection item

package/lib/cjs/DomUtils.js

@@ -16,11 +16,11 @@ var DomUtils;
     /**
      * Language cache parameter name
      */
-    DomUtils.Culture = 'culture';
+    DomUtils.CultureField = 'EtsooCulture';
     /**
      * Country cache parameter name
      */
-    DomUtils.Country = 'country';
+    DomUtils.CountryField = 'EtsooCountry';
     /**
      * Clear form data
      * @param data Form data
@@ -156,12 +156,12 @@ var DomUtils;
      * Current detected country
      */
     DomUtils.detectedCountry = (() => {
+        var _a, _b;
         // URL first, then local storage
         let country;
         try {
             country =
-                new URL(location.href).searchParams.get(DomUtils.Country) ||
-                    localStorage.getItem(DomUtils.Country);
+                (_b = (_a = new URL(location.href).searchParams.get(DomUtils.CountryField)) !== null && _a !== void 0 ? _a : sessionStorage.getItem(DomUtils.CountryField)) !== null && _b !== void 0 ? _b : localStorage.getItem(DomUtils.CountryField);
         }
         catch {
             country = null;
@@ -173,12 +173,12 @@ var DomUtils;
      * Current detected culture
      */
     DomUtils.detectedCulture = (() => {
+        var _a, _b;
         // URL first, then local storage
         let culture;
         try {
             culture =
-                new URL(location.href).searchParams.get(DomUtils.Culture) ||
-                    localStorage.getItem(DomUtils.Culture);
+                (_b = (_a = new URL(location.href).searchParams.get(DomUtils.CultureField)) !== null && _a !== void 0 ? _a : sessionStorage.getItem(DomUtils.CultureField)) !== null && _b !== void 0 ? _b : localStorage.getItem(DomUtils.CultureField);
         }
         catch {
             culture = null;
@@ -342,22 +342,6 @@ var DomUtils;
         return base;
     }
     DomUtils.mergeURLSearchParams = mergeURLSearchParams;
-    /**
-     * Save country name
-     * @param country Country name
-     */
-    function saveCountry(country) {
-        localStorage.setItem(DomUtils.Country, country);
-    }
-    DomUtils.saveCountry = saveCountry;
-    /**
-     * Save culture name
-     * @param culture Culture name
-     */
-    function saveCulture(culture) {
-        localStorage.setItem(DomUtils.Culture, culture);
-    }
-    DomUtils.saveCulture = saveCulture;
     /**
      * Set HTML element focus by name
      * @param name Element name or first collection item

package/lib/cjs/storage/WindowStorage.js

@@ -17,6 +17,7 @@ class WindowStorage {
         if (globalFields.length == 0)
             return;
         // Copy global fields to session storage where first item does not exist
+        // Duplicate browser tab would copy the session storage
         const firsItem = sessionStorage.getItem(globalFields[0]);
         if (firsItem)
             return;

package/lib/mjs/DomUtils.d.ts

@@ -8,11 +8,11 @@ export declare namespace DomUtils {
     /**
      * Language cache parameter name
      */
-    const Culture = "culture";
+    const CultureField = "EtsooCulture";
     /**
      * Country cache parameter name
      */
-    const Country = "country";
+    const CountryField = "EtsooCountry";
     /**
      * Clear form data
      * @param data Form data
@@ -94,16 +94,6 @@ export declare namespace DomUtils {
      * @param data New simple object data to merge
      */
     function mergeURLSearchParams(base: URLSearchParams, data: DataTypes.SimpleObject): URLSearchParams;
-    /**
-     * Save country name
-     * @param country Country name
-     */
-    function saveCountry(country: string): void;
-    /**
-     * Save culture name
-     * @param culture Culture name
-     */
-    function saveCulture(culture: string): void;
     /**
      * Set HTML element focus by name
      * @param name Element name or first collection item

package/lib/mjs/DomUtils.js

@@ -13,11 +13,11 @@ export var DomUtils;
     /**
      * Language cache parameter name
      */
-    DomUtils.Culture = 'culture';
+    DomUtils.CultureField = 'EtsooCulture';
     /**
      * Country cache parameter name
      */
-    DomUtils.Country = 'country';
+    DomUtils.CountryField = 'EtsooCountry';
     /**
      * Clear form data
      * @param data Form data
@@ -153,12 +153,12 @@ export var DomUtils;
      * Current detected country
      */
     DomUtils.detectedCountry = (() => {
+        var _a, _b;
         // URL first, then local storage
         let country;
         try {
             country =
-                new URL(location.href).searchParams.get(DomUtils.Country) ||
-                    localStorage.getItem(DomUtils.Country);
+                (_b = (_a = new URL(location.href).searchParams.get(DomUtils.CountryField)) !== null && _a !== void 0 ? _a : sessionStorage.getItem(DomUtils.CountryField)) !== null && _b !== void 0 ? _b : localStorage.getItem(DomUtils.CountryField);
         }
         catch {
             country = null;
@@ -170,12 +170,12 @@ export var DomUtils;
      * Current detected culture
      */
     DomUtils.detectedCulture = (() => {
+        var _a, _b;
         // URL first, then local storage
         let culture;
         try {
             culture =
-                new URL(location.href).searchParams.get(DomUtils.Culture) ||
-                    localStorage.getItem(DomUtils.Culture);
+                (_b = (_a = new URL(location.href).searchParams.get(DomUtils.CultureField)) !== null && _a !== void 0 ? _a : sessionStorage.getItem(DomUtils.CultureField)) !== null && _b !== void 0 ? _b : localStorage.getItem(DomUtils.CultureField);
         }
         catch {
             culture = null;
@@ -339,22 +339,6 @@ export var DomUtils;
         return base;
     }
     DomUtils.mergeURLSearchParams = mergeURLSearchParams;
-    /**
-     * Save country name
-     * @param country Country name
-     */
-    function saveCountry(country) {
-        localStorage.setItem(DomUtils.Country, country);
-    }
-    DomUtils.saveCountry = saveCountry;
-    /**
-     * Save culture name
-     * @param culture Culture name
-     */
-    function saveCulture(culture) {
-        localStorage.setItem(DomUtils.Culture, culture);
-    }
-    DomUtils.saveCulture = saveCulture;
     /**
      * Set HTML element focus by name
      * @param name Element name or first collection item

package/lib/mjs/storage/WindowStorage.js

@@ -14,6 +14,7 @@ export class WindowStorage {
         if (globalFields.length == 0)
             return;
         // Copy global fields to session storage where first item does not exist
+        // Duplicate browser tab would copy the session storage
         const firsItem = sessionStorage.getItem(globalFields[0]);
         if (firsItem)
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.0.83",
+    "version": "1.0.84",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/DomUtils.ts

@@ -15,12 +15,12 @@ export namespace DomUtils {
     /**
      * Language cache parameter name
      */
-    export const Culture = 'culture';
+    export const CultureField = 'EtsooCulture';
 
     /**
      * Country cache parameter name
      */
-    export const Country = 'country';
+    export const CountryField = 'EtsooCountry';
 
     /**
      * Clear form data
@@ -198,8 +198,9 @@ export namespace DomUtils {
         let country: string | null;
         try {
             country =
-                new URL(location.href).searchParams.get(Country) ||
-                localStorage.getItem(Country);
+                new URL(location.href).searchParams.get(CountryField) ??
+                sessionStorage.getItem(CountryField) ??
+                localStorage.getItem(CountryField);
         } catch {
             country = null;
         }
@@ -216,8 +217,9 @@ export namespace DomUtils {
         let culture: string | null;
         try {
             culture =
-                new URL(location.href).searchParams.get(Culture) ||
-                localStorage.getItem(Culture);
+                new URL(location.href).searchParams.get(CultureField) ??
+                sessionStorage.getItem(CultureField) ??
+                localStorage.getItem(CultureField);
         } catch {
             culture = null;
         }
@@ -415,22 +417,6 @@ export namespace DomUtils {
         return base;
     }
 
-    /**
-     * Save country name
-     * @param country Country name
-     */
-    export function saveCountry(country: string) {
-        localStorage.setItem(Country, country);
-    }
-
-    /**
-     * Save culture name
-     * @param culture Culture name
-     */
-    export function saveCulture(culture: string) {
-        localStorage.setItem(Culture, culture);
-    }
-
     /**
      * Set HTML element focus by name
      * @param name Element name or first collection item

package/src/storage/WindowStorage.ts

@@ -15,6 +15,7 @@ export class WindowStorage implements IStorage {
         if (globalFields.length == 0) return;
 
         // Copy global fields to session storage where first item does not exist
+        // Duplicate browser tab would copy the session storage
         const firsItem = sessionStorage.getItem(globalFields[0]);
         if (firsItem) return;