@reykjavik/hanna-react 0.10.153 → 0.10.155

package/CHANGELOG.md

@@ -4,6 +4,20 @@
 
 - ... <!-- Add new lines here. -->
 
+## 0.10.155
+
+_2025-06-23_
+
+- feat: Allow `MainMenu2` items to be `undefined` for easier conditional item
+  array population
+
+## 0.10.154
+
+_2025-06-20_
+
+- feat: Add optional `inline` prop to `LayoutProps.customLogo`
+- fix: `ImageProps.inline` should not fail to replace with an empty result
+
 ## 0.10.153
 
 _2025-06-19_

package/MainMenu2.d.ts

@@ -64,11 +64,11 @@ export type MainMenu2SubMenuItem = MainMenu2Item & {
 export type MainMenu2SubMenu = {
     title: string;
     current?: boolean;
-    subItems: Array<MainMenu2SubMenuItem | MainMenu2CustomItem>;
+    subItems: Array<MainMenu2SubMenuItem | MainMenu2CustomItem | undefined>;
 };
-export type MainMenu2ItemList = Array<MainMenu2Item | MainMenu2CustomItem>;
-export type MainMenu2ButtonItemList = Array<MainMenu2ButtonItem | MainMenu2CustomItem>;
-export type MainMenu2SubMenuItemList = Array<MainMenu2SubMenuItem | MainMenu2CustomItem>;
+export type MainMenu2ItemList = Array<MainMenu2Item | MainMenu2CustomItem | undefined>;
+export type MainMenu2ButtonItemList = Array<MainMenu2ButtonItem | MainMenu2CustomItem | undefined>;
+export type MainMenu2SubMenuItemList = Array<MainMenu2SubMenuItem | MainMenu2CustomItem | undefined>;
 export type MainMenu2Props = {
     /**
      * URL for the mandatory (usually screen-reader-only) homepage Link.

package/MainMenu2.js

@@ -64,6 +64,9 @@ const iconMap = {
 const getRenderers = (props) => {
     const { onItemClick, closeMenu, openMenu, isBrowser } = props;
     const renderItem = (classPrefix, item, opts = {}) => {
+        if (!item) {
+            return;
+        }
         const { key, Tag = 'li', button } = opts;
         if (typeof item === 'function') {
             const Item = item;
@@ -109,7 +112,8 @@ const getRenderers = (props) => {
         if (!items || !items.length) {
             return null;
         }
-        return (react_1.default.createElement("ul", Object.assign({ className: `${classSuffix}items` }, opts.listProps), items.map((listItem, i) => renderItem(classSuffix, listItem, { key: i, button: opts.buttons }))));
+        return (react_1.default.createElement("ul", Object.assign({ className: `${classSuffix}items` }, opts.listProps), items.map((listItem, i) => listItem &&
+            renderItem(classSuffix, listItem, { key: i, button: opts.buttons }))));
     };
     return { renderList, renderItem };
 };
@@ -163,7 +167,7 @@ const MainMenu2 = (props) => {
             if (!('title' in item) || 'current' in item) {
                 return item;
             }
-            const current = (_a = item.subItems.find((subItem) => 'current' in subItem && !!subItem.current)) === null || _a === void 0 ? void 0 : _a.current;
+            const current = (_a = item.subItems.find((subItem) => !!(subItem && 'current' in subItem && !!subItem.current))) === null || _a === void 0 ? void 0 : _a.current;
             return Object.assign(Object.assign({}, item), { current });
         });
         let defaultActive = mainItems.findIndex((item) => 'current' in item && item.current);

package/_abstract/_Layouts.d.ts

@@ -1,6 +1,7 @@
 export declare const renderLayoutHomeLink: (bem: string, logoLink: string, siteName?: string, customLogo?: {
     src: string;
     altText: string;
+    inline?: boolean;
 }) => JSX.Element;
 export declare const issueSiteNameWarningInDev: (props: {
     siteName?: string;

package/_abstract/_Layouts.js

@@ -15,7 +15,7 @@ const renderLayoutHomeLink = (bem, logoLink, siteName, customLogo) => {
     return (react_1.default.createElement(_Link_js_1.Link, { className: `${bem}__header__homelink`, href: logoLink },
         ' ',
         react_1.default.createElement(_Image_js_1.Image, { bem: undefined, className: (0, hanna_utils_1.modifiedClass)(`${bem}__header__logo`, customLogo && 'custom'), src: (customLogo === null || customLogo === void 0 ? void 0 : customLogo.src) ||
-                (0, assets_1.getRvkLogoUrl)(siteName ? 'reykjavik-logo-notext.svg' : 'reykjavik-logo.svg'), altText: (customLogo === null || customLogo === void 0 ? void 0 : customLogo.altText) || 'Reykjavík', inline: true }),
+                (0, assets_1.getRvkLogoUrl)(siteName ? 'reykjavik-logo-notext.svg' : 'reykjavik-logo.svg'), altText: (customLogo === null || customLogo === void 0 ? void 0 : customLogo.altText) || 'Reykjavík', inline: customLogo ? customLogo.inline : true }),
         ' ',
         siteName && react_1.default.createElement("span", { className: `${bem}__header__sitename` }, siteName),
         ' '));

package/esm/MainMenu2.d.ts

@@ -64,11 +64,11 @@ export type MainMenu2SubMenuItem = MainMenu2Item & {
 export type MainMenu2SubMenu = {
     title: string;
     current?: boolean;
-    subItems: Array<MainMenu2SubMenuItem | MainMenu2CustomItem>;
+    subItems: Array<MainMenu2SubMenuItem | MainMenu2CustomItem | undefined>;
 };
-export type MainMenu2ItemList = Array<MainMenu2Item | MainMenu2CustomItem>;
-export type MainMenu2ButtonItemList = Array<MainMenu2ButtonItem | MainMenu2CustomItem>;
-export type MainMenu2SubMenuItemList = Array<MainMenu2SubMenuItem | MainMenu2CustomItem>;
+export type MainMenu2ItemList = Array<MainMenu2Item | MainMenu2CustomItem | undefined>;
+export type MainMenu2ButtonItemList = Array<MainMenu2ButtonItem | MainMenu2CustomItem | undefined>;
+export type MainMenu2SubMenuItemList = Array<MainMenu2SubMenuItem | MainMenu2CustomItem | undefined>;
 export type MainMenu2Props = {
     /**
      * URL for the mandatory (usually screen-reader-only) homepage Link.

package/esm/MainMenu2.js

@@ -60,6 +60,9 @@ const iconMap = {
 const getRenderers = (props) => {
     const { onItemClick, closeMenu, openMenu, isBrowser } = props;
     const renderItem = (classPrefix, item, opts = {}) => {
+        if (!item) {
+            return;
+        }
         const { key, Tag = 'li', button } = opts;
         if (typeof item === 'function') {
             const Item = item;
@@ -105,7 +108,8 @@ const getRenderers = (props) => {
         if (!items || !items.length) {
             return null;
         }
-        return (React.createElement("ul", Object.assign({ className: `${classSuffix}items` }, opts.listProps), items.map((listItem, i) => renderItem(classSuffix, listItem, { key: i, button: opts.buttons }))));
+        return (React.createElement("ul", Object.assign({ className: `${classSuffix}items` }, opts.listProps), items.map((listItem, i) => listItem &&
+            renderItem(classSuffix, listItem, { key: i, button: opts.buttons }))));
     };
     return { renderList, renderItem };
 };
@@ -159,7 +163,7 @@ export const MainMenu2 = (props) => {
             if (!('title' in item) || 'current' in item) {
                 return item;
             }
-            const current = (_a = item.subItems.find((subItem) => 'current' in subItem && !!subItem.current)) === null || _a === void 0 ? void 0 : _a.current;
+            const current = (_a = item.subItems.find((subItem) => !!(subItem && 'current' in subItem && !!subItem.current))) === null || _a === void 0 ? void 0 : _a.current;
             return Object.assign(Object.assign({}, item), { current });
         });
         let defaultActive = mainItems.findIndex((item) => 'current' in item && item.current);

package/esm/_abstract/_Layouts.d.ts

@@ -1,6 +1,7 @@
 export declare const renderLayoutHomeLink: (bem: string, logoLink: string, siteName?: string, customLogo?: {
     src: string;
     altText: string;
+    inline?: boolean;
 }) => JSX.Element;
 export declare const issueSiteNameWarningInDev: (props: {
     siteName?: string;

package/esm/_abstract/_Layouts.js

@@ -11,7 +11,7 @@ export const renderLayoutHomeLink = (bem, logoLink, siteName, customLogo) => {
     return (React.createElement(Link, { className: `${bem}__header__homelink`, href: logoLink },
         ' ',
         React.createElement(Image, { bem: undefined, className: modifiedClass(`${bem}__header__logo`, customLogo && 'custom'), src: (customLogo === null || customLogo === void 0 ? void 0 : customLogo.src) ||
-                getRvkLogoUrl(siteName ? 'reykjavik-logo-notext.svg' : 'reykjavik-logo.svg'), altText: (customLogo === null || customLogo === void 0 ? void 0 : customLogo.altText) || 'Reykjavík', inline: true }),
+                getRvkLogoUrl(siteName ? 'reykjavik-logo-notext.svg' : 'reykjavik-logo.svg'), altText: (customLogo === null || customLogo === void 0 ? void 0 : customLogo.altText) || 'Reykjavík', inline: customLogo ? customLogo.inline : true }),
         ' ',
         siteName && React.createElement("span", { className: `${bem}__header__sitename` }, siteName),
         ' '));

package/esm/utils/useGetSVGtext.js

@@ -10,6 +10,9 @@ export const useGetSVGtext = (imageSrc, altText) => {
     useEffect(() => {
         if (imageSrc) {
             getSVGtext(imageSrc, altText).then((code) => {
+                if (!code) {
+                    return;
+                }
                 if (imageSrc === srcRef.current) {
                     setInlineSvg({ imageSrc, code });
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@reykjavik/hanna-react",
-	"version": "0.10.153",
+	"version": "0.10.155",
 	"author": "Reykjavík (http://www.reykjavik.is)",
 	"contributors": [
 		"Hugsmiðjan ehf (http://www.hugsmidjan.is)",
@@ -17,7 +17,7 @@
 		"@floating-ui/react": "^0.19.2",
 		"@hugsmidjan/qj": "^4.22.1",
 		"@hugsmidjan/react": "^0.4.32",
-		"@reykjavik/hanna-css": "^0.4.18",
+		"@reykjavik/hanna-css": "^0.4.19",
 		"@reykjavik/hanna-utils": "^0.2.21",
 		"@types/react-autosuggest": "^10.1.0",
 		"@types/react-datepicker": "^4.8.0",

package/utils/useGetSVGtext.js

@@ -13,6 +13,9 @@ const useGetSVGtext = (imageSrc, altText) => {
     (0, react_1.useEffect)(() => {
         if (imageSrc) {
             (0, hanna_utils_1.getSVGtext)(imageSrc, altText).then((code) => {
+                if (!code) {
+                    return;
+                }
                 if (imageSrc === srcRef.current) {
                     setInlineSvg({ imageSrc, code });
                 }