@reykjavik/hanna-react 0.10.107 → 0.10.108

package/CHANGELOG.md

@@ -4,6 +4,14 @@
 
 - ... <!-- Add new lines here. -->
 
+## 0.10.108
+
+_2023-10-09_
+
+- fix: Add `rel="nofollow"` to all `Pagination` links
+- fix: Fix esm import inside `useDomid` causing build errors in React<=v17
+- fix: Make `useDomid` more efficient in React<=v17
+
 ## 0.10.107
 
 _2023-10-05_

package/Pagination.js

@@ -22,7 +22,7 @@ const PaginationButton = (props) => {
         'aria-current': modifier === 'active' || undefined,
         'aria-controls': props.ariaControls,
     };
-    return href && !disabled ? (react_1.default.createElement(_Link_js_1.Link, Object.assign({ href: href(page) }, btnProps))) : (react_1.default.createElement("button", Object.assign({ type: props.type, disabled: disabled }, btnProps)));
+    return href && !disabled ? (react_1.default.createElement(_Link_js_1.Link, Object.assign({ href: href(page), rel: "nofollow" }, btnProps))) : (react_1.default.createElement("button", Object.assign({ type: props.type, disabled: disabled }, btnProps)));
 };
 // ---------------------------------------------------------------------------
 const getBtnRenderer = (cfg) => {

package/esm/Pagination.js

@@ -18,7 +18,7 @@ const PaginationButton = (props) => {
         'aria-current': modifier === 'active' || undefined,
         'aria-controls': props.ariaControls,
     };
-    return href && !disabled ? (React.createElement(Link, Object.assign({ href: href(page) }, btnProps))) : (React.createElement("button", Object.assign({ type: props.type, disabled: disabled }, btnProps)));
+    return href && !disabled ? (React.createElement(Link, Object.assign({ href: href(page), rel: "nofollow" }, btnProps))) : (React.createElement("button", Object.assign({ type: props.type, disabled: disabled }, btnProps)));
 };
 // ---------------------------------------------------------------------------
 const getBtnRenderer = (cfg) => {

package/esm/utils/useDomid.d.ts

@@ -1,8 +1,10 @@
 /**
  * Returns a stable, unique ID string.
  *
- * Uses useId from React@18 when available, but falls back on a custom id
- * generator. (The custom generator causes angry hydration warnings in dev
- * mode).
+ * Uses useId from React (v18+) when available, falling back on a custom
+ * unique id generator.
+ *
+ * (NOTE: The custom generator causes angry hydration warnings in dev
+ * mode and there's nothing we can do about it.)
  */
 export declare const useDomid: (staticId?: string) => string;

package/esm/utils/useDomid.js

@@ -1,17 +1,25 @@
-import * as React from 'react';
+import React from 'react';
 import domid from '@hugsmidjan/qj/domid';
 // @ts-expect-error  (transparently feature-detect useId hook, which is introduced in React@18)
 const useId = React.useId;
 /**
  * Returns a stable, unique ID string.
  *
- * Uses useId from React@18 when available, but falls back on a custom id
- * generator. (The custom generator causes angry hydration warnings in dev
- * mode).
+ * Uses useId from React (v18+) when available, falling back on a custom
+ * unique id generator.
+ *
+ * (NOTE: The custom generator causes angry hydration warnings in dev
+ * mode and there's nothing we can do about it.)
  */
 export const useDomid = useId
     ? (staticId) => {
         const id = useId();
         return staticId || id;
     }
-    : (staticId) => React.useRef(staticId || domid()).current;
+    : (staticId) => {
+        const idRef = React.useRef();
+        if (!idRef.current) {
+            idRef.current = staticId || domid();
+        }
+        return idRef.current;
+    };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@reykjavik/hanna-react",
-	"version": "0.10.107",
+	"version": "0.10.108",
 	"author": "Reykjavík (http://www.reykjavik.is)",
 	"contributors": [
 		"Hugsmiðjan ehf (http://www.hugsmidjan.is)",

package/utils/useDomid.d.ts

@@ -1,8 +1,10 @@
 /**
  * Returns a stable, unique ID string.
  *
- * Uses useId from React@18 when available, but falls back on a custom id
- * generator. (The custom generator causes angry hydration warnings in dev
- * mode).
+ * Uses useId from React (v18+) when available, falling back on a custom
+ * unique id generator.
+ *
+ * (NOTE: The custom generator causes angry hydration warnings in dev
+ * mode and there's nothing we can do about it.)
  */
 export declare const useDomid: (staticId?: string) => string;

package/utils/useDomid.js

@@ -2,20 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useDomid = void 0;
 const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
+const react_1 = tslib_1.__importDefault(require("react"));
 const domid_1 = tslib_1.__importDefault(require("@hugsmidjan/qj/domid"));
 // @ts-expect-error  (transparently feature-detect useId hook, which is introduced in React@18)
-const useId = React.useId;
+const useId = react_1.default.useId;
 /**
  * Returns a stable, unique ID string.
  *
- * Uses useId from React@18 when available, but falls back on a custom id
- * generator. (The custom generator causes angry hydration warnings in dev
- * mode).
+ * Uses useId from React (v18+) when available, falling back on a custom
+ * unique id generator.
+ *
+ * (NOTE: The custom generator causes angry hydration warnings in dev
+ * mode and there's nothing we can do about it.)
  */
 exports.useDomid = useId
     ? (staticId) => {
         const id = useId();
         return staticId || id;
     }
-    : (staticId) => React.useRef(staticId || (0, domid_1.default)()).current;
+    : (staticId) => {
+        const idRef = react_1.default.useRef();
+        if (!idRef.current) {
+            idRef.current = staticId || (0, domid_1.default)();
+        }
+        return idRef.current;
+    };