@workday/canvas-kit-react 7.0.0-alpha.0-next.7 → 7.0.0-alpha.100-next.25

package/dist/commonjs/modal/lib/ModalOverlay.d.ts

@@ -1,12 +1,44 @@
 import React from 'react';
-import { PopupModel } from '@workday/canvas-kit-react/popup';
 import { BoxProps } from '@workday/canvas-kit-react/layout';
 export interface ModalOverlayProps extends BoxProps {
-    model?: PopupModel;
     children: React.ReactNode;
 }
-export declare const ModalOverlay: import("../../common").ElementComponent<"div", ModalOverlayProps>;
-export declare const useModalOverlay: <P extends {}, R>(model: import("../../common").Model<import("../../popup").PopupState, import("../../popup").PopupEvents>, elemProps?: P | undefined, ref?: ((instance: R | null) => void) | React.RefObject<R> | null | undefined) => {
+export declare const ModalOverlay: import("../../common").ElementComponentM<"div", ModalOverlayProps, {
+    state: {
+        stackRef: React.RefObject<HTMLDivElement>;
+        targetRef: React.RefObject<HTMLButtonElement>;
+        initialFocusRef: React.RefObject<any> | undefined;
+        returnFocusRef: React.RefObject<any> | undefined;
+        placement: import("@popperjs/core").Placement;
+        id: string;
+        visibility: import("../..").Visibility;
+    };
+    events: {
+        updatePlacement(data: {
+            placement: import("@popperjs/core").Placement;
+        }): void;
+        show(event?: Event | React.SyntheticEvent<Element, Event> | undefined): void;
+        hide(event?: Event | React.SyntheticEvent<Element, Event> | undefined): void;
+    };
+}>;
+export declare const useModalOverlay: <P extends {}, R>(model: {
+    state: {
+        stackRef: React.RefObject<HTMLDivElement>;
+        targetRef: React.RefObject<HTMLButtonElement>;
+        initialFocusRef: React.RefObject<any> | undefined;
+        returnFocusRef: React.RefObject<any> | undefined;
+        placement: import("@popperjs/core").Placement;
+        id: string;
+        visibility: import("../..").Visibility;
+    };
+    events: {
+        updatePlacement(data: {
+            placement: import("@popperjs/core").Placement;
+        }): void;
+        show(event?: Event | React.SyntheticEvent<Element, Event> | undefined): void;
+        hide(event?: Event | React.SyntheticEvent<Element, Event> | undefined): void;
+    };
+}, elemProps?: P | undefined, ref?: ((instance: R | null) => void) | React.RefObject<R> | null | undefined) => {
     ref: undefined;
 } & P & (R extends HTMLOrSVGElement ? {
     ref: React.Ref<R>;

package/dist/commonjs/modal/lib/ModalOverlay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModalOverlay.d.ts","sourceRoot":"","sources":["../../../../modal/lib/ModalOverlay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAW1B,OAAO,EAAC,UAAU,EAAmC,MAAM,iCAAiC,CAAC;AAG7F,OAAO,EAAM,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAE/D,MAAM,WAAW,iBAAkB,SAAQ,QAAQ;IACjD,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AA+CD,eAAO,MAAM,YAAY,mEAWvB,CAAC;AAEH,eAAO,MAAM,eAAe;;;;OAQ1B,CAAC"}
+{"version":3,"file":"ModalOverlay.d.ts","sourceRoot":"","sources":["../../../../modal/lib/ModalOverlay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAa1B,OAAO,EAAM,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAG/D,MAAM,WAAW,iBAAkB,SAAQ,QAAQ;IACjD,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AA+CD,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;EAOvB,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;OAQ1B,CAAC"}

package/dist/commonjs/modal/lib/ModalOverlay.js

@@ -14,17 +14,6 @@ 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;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -37,6 +26,7 @@ var popup_1 = require("@workday/canvas-kit-react/popup");
 var react_2 = require("@emotion/react");
 var styled_1 = __importDefault(require("@emotion/styled"));
 var layout_1 = require("@workday/canvas-kit-react/layout");
+var hooks_1 = require("./hooks");
 var fadeIn = react_2.keyframes(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  from {\n    background: none;\n  }\n  to {\n    background: rgba(0,0,0,0.65);\n  }\n"], ["\n  from {\n    background: none;\n  }\n  to {\n    background: rgba(0,0,0,0.65);\n  }\n"])));
 var Container = styled_1.default(layout_1.Box)({
     position: 'fixed',
@@ -71,15 +61,13 @@ var CenteringContainer = styled_1.default('div')({
         height: '100vh',
     },
 });
-exports.ModalOverlay = common_1.createComponent('div')({
+exports.ModalOverlay = common_1.createSubcomponent('div')({
     displayName: 'Modal.Overlay',
-    Component: function (_a, ref, Element) {
-        var model = _a.model, children = _a.children, elemProps = __rest(_a, ["model", "children"]);
-        var localModel = common_1.useModelContext(popup_1.PopupModelContext, model);
-        return localModel.state.visibility !== 'hidden' ? (react_1.default.createElement(OpenModalOverlay, __assign({ ref: ref, as: Element, model: localModel }, elemProps), children)) : null;
-    },
+    modelHook: hooks_1.useModalModel,
+})(function (elemProps, Element, model) {
+    return model.state.visibility !== 'hidden' ? (react_1.default.createElement(OpenModalOverlay, __assign({ as: Element, model: model }, elemProps))) : null;
 });
-exports.useModalOverlay = common_1.createHook(function (_a, ref) {
+exports.useModalOverlay = common_1.createElemPropsHook(popup_1.usePopupModel)(function (_a, ref) {
     var state = _a.state;
     var elementRef = common_1.useForkRef(ref, state.stackRef);
     popup_1.usePopupStack(elementRef);
@@ -88,27 +76,26 @@ exports.useModalOverlay = common_1.createHook(function (_a, ref) {
         ref: undefined,
     };
 });
-var OpenModalOverlay = common_1.createComponent('div')({
+var OpenModalOverlay = common_1.createSubcomponent('div')({
     displayName: 'Modal.OpenOverlay',
-    Component: function (_a, ref, Element) {
-        var model = _a.model, children = _a.children, elemProps = __rest(_a, ["model", "children"]);
-        var props = exports.useModalOverlay(model, elemProps, ref);
-        var windowSize = common_1.useWindowSize();
-        var content = (react_1.default.createElement(Container, __assign({ as: Element }, props),
-            react_1.default.createElement(CenteringContainer
+    modelHook: hooks_1.useModalModel,
+    elemPropsHook: exports.useModalOverlay,
+})(function (elemProps, Element, model) {
+    var windowSize = common_1.useWindowSize();
+    var content = (react_1.default.createElement(Container, __assign({ as: Element }, elemProps),
+        react_1.default.createElement(CenteringContainer
+        // make sure the centering container is an even number of pixels to avoid sub-pixel
+        // inaccuracies due to centering
+        , { 
             // make sure the centering container is an even number of pixels to avoid sub-pixel
             // inaccuracies due to centering
-            , { 
-                // make sure the centering container is an even number of pixels to avoid sub-pixel
-                // inaccuracies due to centering
-                style: { width: windowSize.width % 2 === 1 ? 'calc(100vw - 1px)' : '100vw' } }, children)));
-        // only render something on the client
-        if (typeof window !== 'undefined') {
-            return react_dom_1.default.createPortal(content, model.state.stackRef.current);
-        }
-        else {
-            return null;
-        }
-    },
+            style: { width: windowSize.width % 2 === 1 ? 'calc(100vw - 1px)' : '100vw' } }, elemProps.children)));
+    // only render something on the client
+    if (typeof window !== 'undefined') {
+        return react_dom_1.default.createPortal(content, model.state.stackRef.current);
+    }
+    else {
+        return null;
+    }
 });
 var templateObject_1;

package/dist/commonjs/modal/lib/hooks/useCloseOnOverlayClick.d.ts

@@ -1,8 +1,27 @@
-import { PopupModel } from '@workday/canvas-kit-react/popup';
+import React from 'react';
 /**
  * Registers global listener for all clicks. It will only call the PopupModel's `hide` event if the
  * click happened outside the `[role=dialog]` of an overlay component. The difference between `useCloseOnOutsideClick`
  * and `useCloseOnOverlayClick` is the Overlay is a child of a `stackRef` element and has a different
  */
-export declare const useCloseOnOverlayClick: (model: PopupModel, elemProps?: {}) => {};
+export declare const useCloseOnOverlayClick: <P extends {}, R>(model: {
+    state: {
+        stackRef: React.RefObject<HTMLDivElement>;
+        targetRef: React.RefObject<HTMLButtonElement>;
+        initialFocusRef: React.RefObject<any> | undefined;
+        returnFocusRef: React.RefObject<any> | undefined;
+        placement: import("@popperjs/core").Placement;
+        id: string;
+        visibility: import("../../..").Visibility;
+    };
+    events: {
+        updatePlacement(data: {
+            placement: import("@popperjs/core").Placement;
+        }): void;
+        show(event?: Event | React.SyntheticEvent<Element, Event> | undefined): void;
+        hide(event?: Event | React.SyntheticEvent<Element, Event> | undefined): void;
+    };
+}, elemProps?: P | undefined, ref?: ((instance: R | null) => void) | React.RefObject<R> | null | undefined) => {} & P & (R extends HTMLOrSVGElement ? {
+    ref: React.Ref<R>;
+} : {});
 //# sourceMappingURL=useCloseOnOverlayClick.d.ts.map

package/dist/commonjs/modal/lib/hooks/useCloseOnOverlayClick.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useCloseOnOverlayClick.d.ts","sourceRoot":"","sources":["../../../../../modal/lib/hooks/useCloseOnOverlayClick.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,UAAU,EAAC,MAAM,iCAAiC,CAAC;AAE3D;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,UAAW,UAAU,uBA8CvD,CAAC"}
+{"version":3,"file":"useCloseOnOverlayClick.d.ts","sourceRoot":"","sources":["../../../../../modal/lib/hooks/useCloseOnOverlayClick.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B;;;;GAIG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;OA8CjC,CAAC"}

package/dist/commonjs/modal/lib/hooks/useCloseOnOverlayClick.js

@@ -6,13 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useCloseOnOverlayClick = void 0;
 var react_1 = __importDefault(require("react"));
 var canvas_kit_popup_stack_1 = require("@workday/canvas-kit-popup-stack");
+var common_1 = require("@workday/canvas-kit-react/common");
+var popup_1 = require("@workday/canvas-kit-react/popup");
 /**
  * Registers global listener for all clicks. It will only call the PopupModel's `hide` event if the
  * click happened outside the `[role=dialog]` of an overlay component. The difference between `useCloseOnOutsideClick`
  * and `useCloseOnOverlayClick` is the Overlay is a child of a `stackRef` element and has a different
  */
-var useCloseOnOverlayClick = function (model, elemProps) {
-    if (elemProps === void 0) { elemProps = {}; }
+exports.useCloseOnOverlayClick = common_1.createElemPropsHook(popup_1.usePopupModel)(function (model) {
     var onClick = react_1.default.useCallback(function (event) {
         if (!model.state.stackRef.current) {
             return;
@@ -32,7 +33,7 @@ var useCloseOnOverlayClick = function (model, elemProps) {
             elements.length &&
             elements[elements.length - 1] === model.state.stackRef.current &&
             elementsBetweenDialogAnBody.some(function (element) { return element === event.target; })) {
-            model.events.hide({ event: event });
+            model.events.hide(event);
         }
     }, [model.state.stackRef, model.events]);
     var visible = model.state.visibility !== 'hidden';
@@ -47,6 +48,5 @@ var useCloseOnOverlayClick = function (model, elemProps) {
             document.removeEventListener('mousedown', onClick);
         };
     }, [model.state.stackRef, visible, onClick]);
-    return elemProps;
-};
-exports.useCloseOnOverlayClick = useCloseOnOverlayClick;
+    return {};
+});

package/dist/commonjs/modal/lib/hooks/useModalCard.d.ts

@@ -1,4 +1,21 @@
-export declare const useModalCard: <P extends {}, R>(model: import("../../../common").Model<import("../../../popup").PopupState, import("../../../popup").PopupEvents>, elemProps?: P | undefined, ref?: ((instance: R | null) => void) | import("react").RefObject<R> | null | undefined) => {} & P & (R extends HTMLOrSVGElement ? {
+export declare const useModalCard: <P extends {}, R>(model: {
+    state: {
+        stackRef: import("react").RefObject<HTMLDivElement>;
+        targetRef: import("react").RefObject<HTMLButtonElement>;
+        initialFocusRef: import("react").RefObject<any> | undefined;
+        returnFocusRef: import("react").RefObject<any> | undefined;
+        placement: import("@popperjs/core").Placement;
+        id: string;
+        visibility: import("../../..").Visibility;
+    };
+    events: {
+        updatePlacement(data: {
+            placement: import("@popperjs/core").Placement;
+        }): void;
+        show(event?: Event | import("react").SyntheticEvent<Element, Event> | undefined): void;
+        hide(event?: Event | import("react").SyntheticEvent<Element, Event> | undefined): void;
+    };
+}, elemProps?: P | undefined, ref?: ((instance: R | null) => void) | import("react").RefObject<R> | null | undefined) => {} & P & (R extends HTMLOrSVGElement ? {
     ref: import("react").Ref<R>;
 } : {});
 //# sourceMappingURL=useModalCard.d.ts.map

package/dist/commonjs/modal/lib/hooks/useModalCard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useModalCard.d.ts","sourceRoot":"","sources":["../../../../../modal/lib/hooks/useModalCard.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY;;OAOxB,CAAC"}
+{"version":3,"file":"useModalCard.d.ts","sourceRoot":"","sources":["../../../../../modal/lib/hooks/useModalCard.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;OAOxB,CAAC"}

package/dist/commonjs/modal/lib/hooks/useModalCard.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useModalCard = void 0;
 var common_1 = require("@workday/canvas-kit-react/common");
 var popup_1 = require("@workday/canvas-kit-react/popup");
-exports.useModalCard = common_1.composeHooks(popup_1.usePopupCard, common_1.createHook(function (_a) {
-    var state = _a.state;
+exports.useModalCard = common_1.composeHooks(popup_1.usePopupCard, common_1.createElemPropsHook(popup_1.usePopupModel)(function () {
     return {
         'aria-modal': true,
     };

package/dist/commonjs/modal/lib/hooks/useModalHeading.d.ts

@@ -1,5 +1,22 @@
 import React from 'react';
-export declare const useModalHeading: <P extends {}, R>(model: import("../../../common").Model<import("../../../popup").PopupState, import("../../../popup").PopupEvents>, elemProps?: P | undefined, ref?: ((instance: R | null) => void) | React.RefObject<R> | null | undefined) => {} & P & (R extends HTMLOrSVGElement ? {
+export declare const useModalHeading: <P extends {}, R>(model: {
+    state: {
+        stackRef: React.RefObject<HTMLDivElement>;
+        targetRef: React.RefObject<HTMLButtonElement>;
+        initialFocusRef: React.RefObject<any> | undefined;
+        returnFocusRef: React.RefObject<any> | undefined;
+        placement: import("@popperjs/core").Placement;
+        id: string;
+        visibility: import("../../..").Visibility;
+    };
+    events: {
+        updatePlacement(data: {
+            placement: import("@popperjs/core").Placement;
+        }): void;
+        show(event?: Event | React.SyntheticEvent<Element, Event> | undefined): void;
+        hide(event?: Event | React.SyntheticEvent<Element, Event> | undefined): void;
+    };
+}, elemProps?: P | undefined, ref?: ((instance: R | null) => void) | React.RefObject<R> | null | undefined) => {} & P & (R extends HTMLOrSVGElement ? {
     ref: React.Ref<R>;
 } : {});
 //# sourceMappingURL=useModalHeading.d.ts.map

package/dist/commonjs/modal/lib/hooks/useModalHeading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useModalHeading.d.ts","sourceRoot":"","sources":["../../../../../modal/lib/hooks/useModalHeading.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,eAAO,MAAM,eAAe;;OAqB3B,CAAC"}
+{"version":3,"file":"useModalHeading.d.ts","sourceRoot":"","sources":["../../../../../modal/lib/hooks/useModalHeading.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;OAqB3B,CAAC"}

package/dist/commonjs/modal/lib/hooks/useModalHeading.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useModalHeading = void 0;
 var common_1 = require("@workday/canvas-kit-react/common");
 var popup_1 = require("@workday/canvas-kit-react/popup");
-exports.useModalHeading = common_1.composeHooks(popup_1.usePopupHeading, common_1.createHook(function (_, ref) {
+exports.useModalHeading = common_1.composeHooks(popup_1.usePopupHeading, common_1.createElemPropsHook(popup_1.usePopupModel)(function (_, ref) {
     var _a = common_1.useLocalRef(ref), elementRef = _a.elementRef, localRef = _a.localRef;
     common_1.useMountLayout(function () {
         var _a, _b, _c;

package/dist/commonjs/modal/lib/hooks/useModalModel.d.ts

@@ -1,3 +1,120 @@
-import { PopupModelConfig } from '@workday/canvas-kit-react/popup';
-export declare const useModalModel: (config?: PopupModelConfig) => import("../../..").Model<import("../../../popup").PopupState, import("../../../popup").PopupEvents>;
+export declare const useModalModel: (<TT_Special_Generic>(config?: (Partial<{
+    returnFocusRef: import("react").RefObject<any> | undefined;
+    initialFocusRef: import("react").RefObject<any> | undefined;
+    id: string;
+    initialVisibility: import("../../..").Visibility;
+}> & {
+    onUpdatePlacement?: ((data: {
+        placement: import("@popperjs/core").Placement;
+    }, prevState: {
+        stackRef: import("react").RefObject<HTMLDivElement>;
+        targetRef: import("react").RefObject<HTMLButtonElement>;
+        initialFocusRef: import("react").RefObject<any> | undefined;
+        returnFocusRef: import("react").RefObject<any> | undefined;
+        placement: import("@popperjs/core").Placement;
+        id: string;
+        visibility: import("../../..").Visibility;
+    }) => void) | undefined;
+    onShow?: ((data: Event | import("react").SyntheticEvent<Element, Event> | undefined, prevState: {
+        stackRef: import("react").RefObject<HTMLDivElement>;
+        targetRef: import("react").RefObject<HTMLButtonElement>;
+        initialFocusRef: import("react").RefObject<any> | undefined;
+        returnFocusRef: import("react").RefObject<any> | undefined;
+        placement: import("@popperjs/core").Placement;
+        id: string;
+        visibility: import("../../..").Visibility;
+    }) => void) | undefined;
+    onHide?: ((data: Event | import("react").SyntheticEvent<Element, Event> | undefined, prevState: {
+        stackRef: import("react").RefObject<HTMLDivElement>;
+        targetRef: import("react").RefObject<HTMLButtonElement>;
+        initialFocusRef: import("react").RefObject<any> | undefined;
+        returnFocusRef: import("react").RefObject<any> | undefined;
+        placement: import("@popperjs/core").Placement;
+        id: string;
+        visibility: import("../../..").Visibility;
+    }) => void) | undefined;
+} & {
+    shouldUpdatePlacement?: ((data: {
+        placement: import("@popperjs/core").Placement;
+    }, state: {
+        stackRef: import("react").RefObject<HTMLDivElement>;
+        targetRef: import("react").RefObject<HTMLButtonElement>;
+        initialFocusRef: import("react").RefObject<any> | undefined;
+        returnFocusRef: import("react").RefObject<any> | undefined;
+        placement: import("@popperjs/core").Placement;
+        id: string;
+        visibility: import("../../..").Visibility;
+    }) => boolean) | undefined;
+    shouldShow?: ((data: Event | import("react").SyntheticEvent<Element, Event> | undefined, state: {
+        stackRef: import("react").RefObject<HTMLDivElement>;
+        targetRef: import("react").RefObject<HTMLButtonElement>;
+        initialFocusRef: import("react").RefObject<any> | undefined;
+        returnFocusRef: import("react").RefObject<any> | undefined;
+        placement: import("@popperjs/core").Placement;
+        id: string;
+        visibility: import("../../..").Visibility;
+    }) => boolean) | undefined;
+    shouldHide?: ((data: Event | import("react").SyntheticEvent<Element, Event> | undefined, state: {
+        stackRef: import("react").RefObject<HTMLDivElement>;
+        targetRef: import("react").RefObject<HTMLButtonElement>;
+        initialFocusRef: import("react").RefObject<any> | undefined;
+        returnFocusRef: import("react").RefObject<any> | undefined;
+        placement: import("@popperjs/core").Placement;
+        id: string;
+        visibility: import("../../..").Visibility;
+    }) => boolean) | undefined;
+}) | undefined) => {
+    state: {
+        stackRef: import("react").RefObject<HTMLDivElement>;
+        targetRef: import("react").RefObject<HTMLButtonElement>;
+        initialFocusRef: import("react").RefObject<any> | undefined;
+        returnFocusRef: import("react").RefObject<any> | undefined;
+        placement: import("@popperjs/core").Placement;
+        id: string;
+        visibility: import("../../..").Visibility;
+    };
+    events: {
+        updatePlacement(data: {
+            placement: import("@popperjs/core").Placement;
+        }): void;
+        show(event?: Event | import("react").SyntheticEvent<Element, Event> | undefined): void;
+        hide(event?: Event | import("react").SyntheticEvent<Element, Event> | undefined): void;
+    };
+}) & import("../../../common").ModelExtras<{
+    returnFocusRef: import("react").RefObject<any> | undefined;
+    initialFocusRef: import("react").RefObject<any> | undefined;
+    id: string;
+    initialVisibility: import("../../..").Visibility;
+}, {}, {
+    stackRef: import("react").RefObject<HTMLDivElement>;
+    targetRef: import("react").RefObject<HTMLButtonElement>;
+    initialFocusRef: import("react").RefObject<any> | undefined;
+    returnFocusRef: import("react").RefObject<any> | undefined;
+    placement: import("@popperjs/core").Placement;
+    id: string;
+    visibility: import("../../..").Visibility;
+}, {
+    updatePlacement(data: {
+        placement: import("@popperjs/core").Placement;
+    }): void;
+    show(event?: Event | import("react").SyntheticEvent<Element, Event> | undefined): void;
+    hide(event?: Event | import("react").SyntheticEvent<Element, Event> | undefined): void;
+}, {
+    state: {
+        stackRef: import("react").RefObject<HTMLDivElement>;
+        targetRef: import("react").RefObject<HTMLButtonElement>;
+        initialFocusRef: import("react").RefObject<any> | undefined;
+        returnFocusRef: import("react").RefObject<any> | undefined;
+        placement: import("@popperjs/core").Placement;
+        id: string;
+        visibility: import("../../..").Visibility;
+    };
+    events: {
+        updatePlacement(data: {
+            placement: import("@popperjs/core").Placement;
+        }): void;
+        show(event?: Event | import("react").SyntheticEvent<Element, Event> | undefined): void;
+        hide(event?: Event | import("react").SyntheticEvent<Element, Event> | undefined): void;
+    };
+}>;
 //# sourceMappingURL=useModalModel.d.ts.map

package/dist/commonjs/modal/lib/hooks/useModalModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useModalModel.d.ts","sourceRoot":"","sources":["../../../../../modal/lib/hooks/useModalModel.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAQjB,MAAM,iCAAiC,CAAC;AAIzC,eAAO,MAAM,aAAa,YAAY,gBAAgB,wGAYrD,CAAC"}
+{"version":3,"file":"useModalModel.d.ts","sourceRoot":"","sources":["../../../../../modal/lib/hooks/useModalModel.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgBxB,CAAC"}

package/dist/commonjs/modal/lib/hooks/useModalModel.js

@@ -2,9 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useModalModel = void 0;
 var popup_1 = require("@workday/canvas-kit-react/popup");
+var common_1 = require("../../../common");
 var useCloseOnOverlayClick_1 = require("./useCloseOnOverlayClick");
-var useModalModel = function (config) {
-    if (config === void 0) { config = {}; }
+exports.useModalModel = common_1.createModelHook({
+    defaultConfig: popup_1.usePopupModel.defaultConfig,
+    requiredConfig: popup_1.usePopupModel.requiredConfig,
+    contextOverride: popup_1.usePopupModel.Context,
+})(function (config) {
     var model = popup_1.usePopupModel(config);
     popup_1.useInitialFocus(model);
     popup_1.useReturnFocus(model);
@@ -14,5 +18,4 @@ var useModalModel = function (config) {
     popup_1.useAssistiveHideSiblings(model);
     popup_1.useDisableBodyScroll(model);
     return model;
-};
-exports.useModalModel = useModalModel;
+});

package/dist/commonjs/pagination/lib/Pagination/Controls.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { IconButtonProps } from '@workday/canvas-kit-react/button';
+import { TertiaryButtonProps } from '@workday/canvas-kit-react/button';
 import { PaginationModel } from './types';
-export declare type ControlButtonProps = IconButtonProps & React.ButtonHTMLAttributes<HTMLButtonElement> & {
+export declare type ControlButtonProps = TertiaryButtonProps & React.ButtonHTMLAttributes<HTMLButtonElement> & {
     model: PaginationModel;
 };
 export declare type ControlsProps = React.HTMLAttributes<HTMLDivElement>;

package/dist/commonjs/pagination/lib/Pagination/Controls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Controls.d.ts","sourceRoot":"","sources":["../../../../../pagination/lib/Pagination/Controls.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAa,eAAe,EAAC,MAAM,kCAAkC,CAAC;AAQ7E,OAAO,EAAC,eAAe,EAAC,MAAM,SAAS,CAAC;AAIxC,oBAAY,kBAAkB,GAAG,eAAe,GAC9C,KAAK,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,GAAG;IAC9C,KAAK,EAAE,eAAe,CAAC;CACxB,CAAC;AAEJ,oBAAY,aAAa,GAAG,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;AAEjE,eAAO,MAAM,QAAQ,4DAMpB,CAAC;AAEF,eAAO,MAAM,iBAAiB,qCAAoC,kBAAkB,gBAqBnF,CAAC;AAEF,eAAO,MAAM,oBAAoB,qCAAoC,kBAAkB,gBAqBtF,CAAC;AAEF,eAAO,MAAM,gBAAgB,qCAAoC,kBAAkB,gBAqBlF,CAAC;AAEF,eAAO,MAAM,gBAAgB,qCAAoC,kBAAkB,gBAqBlF,CAAC"}
+{"version":3,"file":"Controls.d.ts","sourceRoot":"","sources":["../../../../../pagination/lib/Pagination/Controls.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAiB,mBAAmB,EAAC,MAAM,kCAAkC,CAAC;AAQrF,OAAO,EAAC,eAAe,EAAC,MAAM,SAAS,CAAC;AAIxC,oBAAY,kBAAkB,GAAG,mBAAmB,GAClD,KAAK,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,GAAG;IAC9C,KAAK,EAAE,eAAe,CAAC;CACxB,CAAC;AAEJ,oBAAY,aAAa,GAAG,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;AAEjE,eAAO,MAAM,QAAQ,4DAMpB,CAAC;AAEF,eAAO,MAAM,iBAAiB,qCAAoC,kBAAkB,gBAoBnF,CAAC;AAEF,eAAO,MAAM,oBAAoB,qCAAoC,kBAAkB,gBAoBtF,CAAC;AAEF,eAAO,MAAM,gBAAgB,qCAAoC,kBAAkB,gBAoBlF,CAAC;AAEF,eAAO,MAAM,gBAAgB,qCAAoC,kBAAkB,gBAoBlF,CAAC"}

package/dist/commonjs/pagination/lib/Pagination/Controls.js

@@ -64,7 +64,7 @@ var JumpToFirstButton = function (_a) {
     };
     var shouldUseRTL = useRTL_1.useRTL().shouldUseRTL;
     var icon = shouldUseRTL ? canvas_system_icons_web_1.chevron2xRightSmallIcon : canvas_system_icons_web_1.chevron2xLeftSmallIcon;
-    return (React.createElement(button_1.IconButton, __assign({ "aria-disabled": isDisabled || undefined, variant: "square", size: "small", icon: icon, onClick: handleClick }, restProps)));
+    return (React.createElement(button_1.TertiaryButton, __assign({ "aria-disabled": isDisabled || undefined, size: "small", icon: icon, onClick: handleClick }, restProps)));
 };
 exports.JumpToFirstButton = JumpToFirstButton;
 var StepToPreviousButton = function (_a) {
@@ -79,7 +79,7 @@ var StepToPreviousButton = function (_a) {
     };
     var shouldUseRTL = useRTL_1.useRTL().shouldUseRTL;
     var icon = shouldUseRTL ? canvas_system_icons_web_1.chevronRightSmallIcon : canvas_system_icons_web_1.chevronLeftSmallIcon;
-    return (React.createElement(button_1.IconButton, __assign({ "aria-disabled": isDisabled || undefined, variant: "square", size: "small", icon: icon, onClick: handleClick }, restProps)));
+    return (React.createElement(button_1.TertiaryButton, __assign({ "aria-disabled": isDisabled || undefined, size: "small", icon: icon, onClick: handleClick }, restProps)));
 };
 exports.StepToPreviousButton = StepToPreviousButton;
 var StepToNextButton = function (_a) {
@@ -94,7 +94,7 @@ var StepToNextButton = function (_a) {
     };
     var shouldUseRTL = useRTL_1.useRTL().shouldUseRTL;
     var icon = shouldUseRTL ? canvas_system_icons_web_1.chevronLeftSmallIcon : canvas_system_icons_web_1.chevronRightSmallIcon;
-    return (React.createElement(button_1.IconButton, __assign({ "aria-disabled": isDisabled || undefined, variant: "square", size: "small", icon: icon, onClick: handleClick }, restProps)));
+    return (React.createElement(button_1.TertiaryButton, __assign({ "aria-disabled": isDisabled || undefined, size: "small", icon: icon, onClick: handleClick }, restProps)));
 };
 exports.StepToNextButton = StepToNextButton;
 var JumpToLastButton = function (_a) {
@@ -109,6 +109,6 @@ var JumpToLastButton = function (_a) {
     };
     var shouldUseRTL = useRTL_1.useRTL().shouldUseRTL;
     var icon = shouldUseRTL ? canvas_system_icons_web_1.chevron2xLeftSmallIcon : canvas_system_icons_web_1.chevron2xRightSmallIcon;
-    return (React.createElement(button_1.IconButton, __assign({ "aria-disabled": isDisabled || undefined, variant: "square", size: "small", icon: icon, onClick: handleClick }, restProps)));
+    return (React.createElement(button_1.TertiaryButton, __assign({ "aria-disabled": isDisabled || undefined, size: "small", icon: icon, onClick: handleClick }, restProps)));
 };
 exports.JumpToLastButton = JumpToLastButton;

package/dist/commonjs/pagination/lib/Pagination/PageButton.d.ts

@@ -1,7 +1,6 @@
 import * as React from 'react';
-import { IconButtonProps } from '@workday/canvas-kit-react/button';
 import { PaginationModel } from './types';
-export declare type PageButtonProps = IconButtonProps & React.ButtonHTMLAttributes<HTMLButtonElement> & {
+export declare type PageButtonProps = React.ButtonHTMLAttributes<HTMLButtonElement> & {
     model: PaginationModel;
     pageNumber: number;
 };

package/dist/commonjs/pagination/lib/Pagination/PageButton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PageButton.d.ts","sourceRoot":"","sources":["../../../../../pagination/lib/Pagination/PageButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAa,eAAe,EAAC,MAAM,kCAAkC,CAAC;AAE7E,OAAO,EAAC,eAAe,EAAC,MAAM,SAAS,CAAC;AAiBxC,oBAAY,eAAe,GAAG,eAAe,GAC3C,KAAK,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,GAAG;IAC9C,KAAK,EAAE,eAAe,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEJ,eAAO,MAAM,UAAU,2DAMpB,eAAe,gBAqBjB,CAAC"}
+{"version":3,"file":"PageButton.d.ts","sourceRoot":"","sources":["../../../../../pagination/lib/Pagination/PageButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,OAAO,EAAC,eAAe,EAAC,MAAM,SAAS,CAAC;AAwCxC,oBAAY,eAAe,GAAG,KAAK,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,GAAG;IAC5E,KAAK,EAAE,eAAe,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,UAAU,2DAMpB,eAAe,gBAoBjB,CAAC"}

package/dist/commonjs/pagination/lib/Pagination/PageButton.js

@@ -44,17 +44,42 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PageButton = void 0;
 var React = __importStar(require("react"));
 var common_1 = require("@workday/canvas-kit-react/common");
-var tokens_1 = __importStar(require("@workday/canvas-kit-react/tokens"));
+var tokens_1 = require("@workday/canvas-kit-react/tokens");
 var button_1 = require("@workday/canvas-kit-react/button");
-var toggledStyles = {
-    color: tokens_1.default.colors.frenchVanilla100,
-    fontWeight: 700,
-    pointerEvents: 'none',
-};
-var StyledPageButton = common_1.styled(button_1.IconButton)(__assign({}, tokens_1.type.levels.subtext.large), function (_a) {
+var StyledPageButton = common_1.styled(button_1.BaseButton)({
+    minWidth: tokens_1.space.l,
+    width: tokens_1.space.l,
+    borderRadius: tokens_1.borderRadius.circle,
+    height: tokens_1.space.l,
+}, function (_a) {
     var toggled = _a.toggled;
-    return toggled ? toggledStyles : {};
+    return {
+        fontWeight: toggled ? 700 : 'normal',
+    };
 });
+var getPaginationButtonColors = function (toggled) {
+    return {
+        default: {
+            background: toggled ? tokens_1.colors.blueberry400 : 'transparent',
+            label: toggled ? tokens_1.colors.frenchVanilla100 : tokens_1.colors.blackPepper400,
+        },
+        hover: {
+            background: toggled ? tokens_1.colors.blueberry400 : tokens_1.colors.soap300,
+            label: toggled ? tokens_1.colors.frenchVanilla100 : tokens_1.colors.blackPepper400,
+        },
+        active: {
+            background: toggled ? tokens_1.colors.blueberry400 : 'transparent',
+            label: toggled ? tokens_1.colors.frenchVanilla100 : tokens_1.colors.blackPepper400,
+        },
+        focus: {
+            background: toggled ? tokens_1.colors.blueberry400 : 'transparent',
+            label: toggled ? tokens_1.colors.frenchVanilla100 : tokens_1.colors.blackPepper400,
+        },
+        disabled: {
+            background: tokens_1.colors.licorice100,
+        },
+    };
+};
 var PageButton = function (_a) {
     var model = _a.model, onClick = _a.onClick, pageNumber = _a.pageNumber, children = _a.children, elemProps = __rest(_a, ["model", "onClick", "pageNumber", "children"]);
     var isCurrentPage = pageNumber === model.state.currentPage;
@@ -62,6 +87,6 @@ var PageButton = function (_a) {
         onClick === null || onClick === void 0 ? void 0 : onClick(e);
         model.events.goTo(pageNumber);
     };
-    return (React.createElement(StyledPageButton, __assign({ "aria-current": isCurrentPage ? 'page' : undefined, "aria-pressed": undefined, onClick: handleClick, size: "small", toggled: isCurrentPage, variant: "square" }, elemProps), children || pageNumber));
+    return (React.createElement(StyledPageButton, __assign({ "aria-current": isCurrentPage ? 'page' : undefined, colors: getPaginationButtonColors(isCurrentPage), "aria-pressed": undefined, onClick: handleClick, toggled: isCurrentPage }, elemProps), children || pageNumber));
 };
 exports.PageButton = PageButton;

package/dist/commonjs/pagination/lib/Pagination/Pagination.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { IconButtonProps } from '@workday/canvas-kit-react/button';
+import { TertiaryButtonProps } from '@workday/canvas-kit-react/button';
 import { PaginationModel } from './types';
 import { PaginationNavProps } from './Nav';
 import { ControlsProps } from './Controls';
@@ -30,10 +30,10 @@ export declare type PaginationProps = PaginationConfigurationProps | PaginationM
 export declare const Pagination: {
     (props: PaginationProps): JSX.Element;
     Controls(props: ControlsProps): JSX.Element;
-    JumpToFirstButton(props: IconButtonProps & React.ButtonHTMLAttributes<HTMLButtonElement>): JSX.Element;
-    StepToPreviousButton(props: IconButtonProps & React.ButtonHTMLAttributes<HTMLButtonElement>): JSX.Element;
-    StepToNextButton(props: IconButtonProps & React.ButtonHTMLAttributes<HTMLButtonElement>): JSX.Element;
-    JumpToLastButton(props: IconButtonProps & React.ButtonHTMLAttributes<HTMLButtonElement>): JSX.Element;
+    JumpToFirstButton(props: TertiaryButtonProps & React.ButtonHTMLAttributes<HTMLButtonElement>): JSX.Element;
+    StepToPreviousButton(props: TertiaryButtonProps & React.ButtonHTMLAttributes<HTMLButtonElement>): JSX.Element;
+    StepToNextButton(props: TertiaryButtonProps & React.ButtonHTMLAttributes<HTMLButtonElement>): JSX.Element;
+    JumpToLastButton(props: TertiaryButtonProps & React.ButtonHTMLAttributes<HTMLButtonElement>): JSX.Element;
     PageList(props: Omit<PageListProps, 'model'>): JSX.Element;
     PageListItem(props: PageListItemProps): JSX.Element;
     PageButton({ "aria-label": ariaLabel, ...elemProps }: Omit<PageButtonProps, 'model'>): JSX.Element;

package/dist/commonjs/pagination/lib/Pagination/Pagination.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Pagination.d.ts","sourceRoot":"","sources":["../../../../../pagination/lib/Pagination/Pagination.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAC,eAAe,EAAC,MAAM,kCAAkC,CAAC;AAEjE,OAAO,EAAC,eAAe,EAAC,MAAM,SAAS,CAAC;AAGxC,OAAO,EAAgB,kBAAkB,EAAC,MAAM,OAAO,CAAC;AACxD,OAAO,EAML,aAAa,EACd,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAW,aAAa,EAAgB,iBAAiB,EAAC,MAAM,YAAY,CAAC;AACpF,OAAO,EAAa,eAAe,EAAC,MAAM,cAAc,CAAC;AAGzD,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAC,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAoB,sBAAsB,EAAC,MAAM,qBAAqB,CAAC;AAE9E,eAAO,MAAM,iBAAiB,gCAA6C,CAAC;AAE5E,aAAK,4BAA4B,GAAG,kBAAkB,GAAG;IACvD,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,YAAY,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7C,CAAC;AAEF,aAAK,oBAAoB,GAAG,kBAAkB,GAAG;IAC/C,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,SAAS,CAAC,EAAE,KAAK,CAAC;IAClB,kBAAkB,CAAC,EAAE,KAAK,CAAC;IAC3B,SAAS,CAAC,EAAE,KAAK,CAAC;IAClB,KAAK,EAAE,eAAe,CAAC;IACvB,YAAY,CAAC,EAAE,KAAK,CAAC;CACtB,CAAC;AAMF,oBAAY,eAAe,GAAG,4BAA4B,GAAG,oBAAoB,CAAC;AAElF,eAAO,MAAM,UAAU;YAAW,eAAe;;6BA4BxC,eAAe,GAAG,MAAM,oBAAoB,CAAC,iBAAiB,CAAC;gCAS/D,eAAe,GAAG,MAAM,oBAAoB,CAAC,iBAAiB,CAAC;4BAS/D,eAAe,GAAG,MAAM,oBAAoB,CAAC,iBAAiB,CAAC;4BAS/D,eAAe,GAAG,MAAM,oBAAoB,CAAC,iBAAiB,CAAC;oBAQ1C,KAAK,aAAa,EAAE,OAAO,CAAC;wBAOxB,iBAAiB;0DAOhD,KAAK,eAAe,EAAE,OAAO,CAAC;6BAOM,KAAK,sBAAsB,EAAE,OAAO,CAAC;2BAOzC,aAAa;yBAWb,kBAAkB;qBAItB,KAAK,cAAc,EAAE,OAAO,CAAC;CArF3D,CAAC"}
+{"version":3,"file":"Pagination.d.ts","sourceRoot":"","sources":["../../../../../pagination/lib/Pagination/Pagination.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAC,mBAAmB,EAAC,MAAM,kCAAkC,CAAC;AAErE,OAAO,EAAC,eAAe,EAAC,MAAM,SAAS,CAAC;AAGxC,OAAO,EAAgB,kBAAkB,EAAC,MAAM,OAAO,CAAC;AACxD,OAAO,EAML,aAAa,EACd,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAW,aAAa,EAAgB,iBAAiB,EAAC,MAAM,YAAY,CAAC;AACpF,OAAO,EAAa,eAAe,EAAC,MAAM,cAAc,CAAC;AAGzD,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAC,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAoB,sBAAsB,EAAC,MAAM,qBAAqB,CAAC;AAE9E,eAAO,MAAM,iBAAiB,gCAA6C,CAAC;AAE5E,aAAK,4BAA4B,GAAG,kBAAkB,GAAG;IACvD,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,YAAY,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7C,CAAC;AAEF,aAAK,oBAAoB,GAAG,kBAAkB,GAAG;IAC/C,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,SAAS,CAAC,EAAE,KAAK,CAAC;IAClB,kBAAkB,CAAC,EAAE,KAAK,CAAC;IAC3B,SAAS,CAAC,EAAE,KAAK,CAAC;IAClB,KAAK,EAAE,eAAe,CAAC;IACvB,YAAY,CAAC,EAAE,KAAK,CAAC;CACtB,CAAC;AAMF,oBAAY,eAAe,GAAG,4BAA4B,GAAG,oBAAoB,CAAC;AAElF,eAAO,MAAM,UAAU;YAAW,eAAe;;6BA4BxC,mBAAmB,GAAG,MAAM,oBAAoB,CAAC,iBAAiB,CAAC;gCASnE,mBAAmB,GAAG,MAAM,oBAAoB,CAAC,iBAAiB,CAAC;4BASnE,mBAAmB,GAAG,MAAM,oBAAoB,CAAC,iBAAiB,CAAC;4BASnE,mBAAmB,GAAG,MAAM,oBAAoB,CAAC,iBAAiB,CAAC;oBAQ9C,KAAK,aAAa,EAAE,OAAO,CAAC;wBAOxB,iBAAiB;0DAOhD,KAAK,eAAe,EAAE,OAAO,CAAC;6BAOM,KAAK,sBAAsB,EAAE,OAAO,CAAC;2BAOzC,aAAa;yBAWb,kBAAkB;qBAItB,KAAK,cAAc,EAAE,OAAO,CAAC;CArF3D,CAAC"}