@adamjanicki/ui 1.3.5 → 1.3.7

package/components/Animated/Animated.js

@@ -34,6 +34,6 @@ var Animated = function (_a) {
         }
         return function () { return clearTimeout(timeoutId); };
     }, [visible, shouldRender, duration, keepMountedOnExit]);
-    return (_jsx("div", { className: classNames(className, animationState === "entering" ? enter === null || enter === void 0 ? void 0 : enter.className : exit === null || exit === void 0 ? void 0 : exit.className), style: __assign(__assign(__assign({}, style), (animationState === "entering" ? enter === null || enter === void 0 ? void 0 : enter.style : exit === null || exit === void 0 ? void 0 : exit.style)), { transition: "all ".concat(duration, "ms ease-in-out") }), children: shouldRender && children }));
+    return (_jsx("div", { className: classNames(className, animationState === "entering" ? enter === null || enter === void 0 ? void 0 : enter.className : exit === null || exit === void 0 ? void 0 : exit.className), style: __assign(__assign(__assign({}, style), (animationState === "entering" ? enter === null || enter === void 0 ? void 0 : enter.style : exit === null || exit === void 0 ? void 0 : exit.style)), { transition: "all ".concat(duration, "ms ease-in-out") }), "aria-hidden": !visible, children: shouldRender && children }));
 };
 export default Animated;

package/components/Layer/Layer.d.ts

@@ -22,6 +22,11 @@ type LayerProps = {
      * @default false
      */
     disableEscape?: boolean;
+    /**
+     * [Optional] Whether to return focus to the element that triggered the layer
+     * @default false
+     */
+    returnFocusOnEscape?: boolean;
 };
-declare const Layer: (props: LayerProps) => JSX.Element;
+declare const Layer: ({ returnFocusOnEscape, ...props }: LayerProps) => JSX.Element;
 export default Layer;

package/components/Layer/Layer.js

@@ -9,6 +9,17 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import { jsx as _jsx } from "react/jsx-runtime";
 import React, { useEffect } from "react";
 import { useFocusTrap, useScrollLock } from "../../hooks";
@@ -38,9 +49,19 @@ var BaseLayer = function (_a) {
             },
         }) }));
 };
-var Layer = function (props) {
+var Layer = function (_a) {
+    var _b = _a.returnFocusOnEscape, returnFocusOnEscape = _b === void 0 ? false : _b, props = __rest(_a, ["returnFocusOnEscape"]);
     // Lock and unlock on mount and unmount
     useScrollLock();
+    useEffect(function () {
+        return function () {
+            var _a;
+            var activeEl = document.activeElement;
+            if (!returnFocusOnEscape) {
+                (_a = activeEl === null || activeEl === void 0 ? void 0 : activeEl.blur) === null || _a === void 0 ? void 0 : _a.call(activeEl);
+            }
+        };
+    }, [returnFocusOnEscape]);
     return _jsx(BaseLayer, __assign({}, props, { visible: true }));
 };
 export default Layer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adamjanicki/ui",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "description": "Basic UI components and hooks for React in TypeScript",
   "main": "./index.js",
   "types": "./index.d.ts",

package/style.css

@@ -170,11 +170,11 @@ button:not([disabled]):focus-visible {
 
 /* Badge */
 .ajui-badge {
-  padding: 0.125rem 0.375rem;
+  padding: 2px 6px;
   border-style: solid;
   border-width: 1px;
   font-weight: 600;
-  font-size: 0.875rem;
+  font-size: 14px;
   width: fit-content;
 }