@dvrd/dvr-controls 1.1.5 → 1.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dvrd/dvr-controls",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "Custom web controls",
   "main": "index.ts",
   "files": [
@@ -24,10 +24,6 @@
       "ie >= 11"
     ]
   },
-  "peerDependencies": {
-    "react": "*",
-    "react-router": "*"
-  },
   "dependencies": {
     "@dvrd/idate": "^1.8.8",
     "@fortawesome/fontawesome-svg-core": "6.5.2",
@@ -43,20 +39,24 @@
     "@types/lodash.merge": "^4.6.7",
     "@types/lodash.mergewith": "^4.6.7",
     "@types/node": "18.14.0",
-    "@types/react": "^19.0.8",
+    "@types/react": "^19.0.12",
     "@types/react-color": "3.0.13",
-    "@types/react-dom": "^19.0.3",
+    "@types/react-dom": "^19.0.4",
+    "@types/react-router": "^5.1.20",
     "@types/uuid": "9.0.0",
     "classnames": "2.5.1",
-    "dompurify": "3.0.0",
+    "dompurify": "3.2.4",
     "js-cookie": "3.0.1",
     "lodash.defer": "^4.1.0",
     "lodash.delay": "^4.1.1",
     "lodash.isequal": "^4.5.0",
     "lodash.merge": "^4.6.2",
     "lodash.mergewith": "^4.6.2",
+    "react": "^19.1.0",
     "react-color": "2.19.3",
+    "react-dom": "^19.1.0",
     "react-rnd": "10.4.1",
+    "react-router": "7.4.1",
     "swiper": "^11.1.4",
     "typescript": "5.6.3",
     "uuid": "9.0.0"

package/src/js/textField/dvrdPasswordInput.tsx

@@ -38,6 +38,7 @@ export default function DVRDPasswordInput(props: Props) {
 
     function renderOrnament() {
         const iconName = inputType === 'password' ? 'eye' : 'eye-slash';
+        console.debug(iconName);
         return {
             placement: ElementPosition.RIGHT,
             element: <AwesomeIcon name={iconName} onClick={onClickOrnament} className='dvrd-password-toggle'/>
@@ -64,4 +65,6 @@ export default function DVRDPasswordInput(props: Props) {
             {renderStrength()}
         </div>
     );
-}
+}
+
+DVRDPasswordInput.displayName = 'DVRDPasswordInput';

package/src/js/util/jwtUtil.ts

@@ -19,7 +19,28 @@ export const getJwt = (): string | null => {
     return null;
 };
 
-export const setJwt = (token: string | null, preserveOnNull: boolean = false, includeStorage: boolean = true, _options?: CookieAttributes) => {
+export function setJWT(token: string | null, options?: {
+    preserveNull?: boolean; useStorage?: boolean, cookieName?: string; attributes?: CookieAttributes
+}) {
+    jwtToken = token;
+    const preserveNull = options?.preserveNull ?? false;
+    const useStorage = options?.useStorage ?? true;
+    if (window.allowCookies || !token) {
+        if (token) {
+            let cookieOptions: CookieAttributes = {expires: 1, sameSite: 'strict', ...options?.attributes};
+            if (getSetting('mode') !== 'dev') {
+                cookieOptions.secure = true;
+                cookieOptions.sameSite = 'strict';
+            }
+            const cookieName = options?.cookieName ?? 'JWT';
+            Cookies.set(cookieName, token, options);
+        } else if (!preserveNull) removeJwtCookie();
+        if (useStorage) setJwtToStorage(token, preserveNull);
+    }
+}
+
+export const setJwt = (token: string | null, preserveOnNull: boolean = false, includeStorage: boolean = true,
+                       _options?: CookieAttributes) => {
     console.debug('Settings JWT token', {token, preserveOnNull, includeStorage, allowCookies: window.allowCookies});
     jwtToken = token;
     if (window.allowCookies || !token) {

package/src/js/util/miscUtil.ts

@@ -138,8 +138,8 @@ export const shuffleArray = (arr: any[]): any[] => {
 
 export function nullify<T extends string | Array<any> | Set<any> | number | bigint>(value?: T | null): T | null {
     if (typeof value === 'number' || typeof value === 'bigint') {
-        if (value === 0) return value;
-        return null;
+        if (value === 0) return null;
+        return value;
     }
     if (!value) return null;
     else if (Array.isArray(value) || typeof value === 'string')