@pega/cosmos-react-core 3.0.0-dev.9.1 → 3.0.0-rc.10

package/lib/components/Location/LocationView.d.ts

@@ -31,7 +31,7 @@ export interface LocationViewProps extends BaseLocationProps, BaseProps {
     onClick?: (coords: {
         latitude: number;
         longitude: number;
-        name: string;
+        name?: string;
         address?: string;
     }) => void;
 }

package/lib/components/Location/LocationView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LocationView.d.ts","sourceRoot":"","sources":["../../../src/components/Location/LocationView.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAgD,MAAM,OAAO,CAAC;AAGzE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAOxC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,OAAO,iBAAiB,MAAM,kBAAkB,CAAC;AAGjD,eAAO,MAAM,mBAAmB,yGAK/B,CAAC;AAIF,eAAO,MAAM,kBAAkB;;SAW7B,CAAC;AAkCH,MAAM,WAAW,iBAAkB,SAAQ,iBAAiB,EAAE,SAAS;IACrE;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACvC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,+IAA+I;IAC/I,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,KAAK,IAAI,CAAC;CACZ;AAQD,QAAA,MAAM,YAAY,EAAE,EAAE,CAAC,iBAAiB,CA4GvC,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"LocationView.d.ts","sourceRoot":"","sources":["../../../src/components/Location/LocationView.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAgD,MAAM,OAAO,CAAC;AAGzE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,OAAO,iBAAiB,MAAM,kBAAkB,CAAC;AAGjD,eAAO,MAAM,mBAAmB,yGAK/B,CAAC;AAIF,eAAO,MAAM,kBAAkB;;SAW7B,CAAC;AAoCH,MAAM,WAAW,iBAAkB,SAAQ,iBAAiB,EAAE,SAAS;IACrE;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACvC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,+IAA+I;IAC/I,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,KAAK,IAAI,CAAC;CACZ;AAQD,QAAA,MAAM,YAAY,EAAE,EAAE,CAAC,iBAAiB,CAiHvC,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/lib/components/Location/LocationView.js

@@ -4,9 +4,8 @@ import styled, { css } from 'styled-components';
 import { defaultThemeProp } from '../../theme';
 import { hasProp } from '../../utils';
 import Progress from '../Progress';
-import Flex from '../Flex';
 import { Status } from '../Badges';
-import { loadMapsAPI, getCoords, toGoogleLatLng, getPlaceById } from './utils';
+import { loadMapsAPI, getCoords, toGoogleLatLng, getPlaceById, isLatLngObject } from './utils';
 import MapsContext from './MapsContext';
 export const StyledLocationError = styled.div `
   position: absolute;
@@ -41,6 +40,7 @@ const StyledMap = styled.div(({ height, disabled, status, eMessage, theme: { bas
       `}
     `;
 });
+StyledMap.defaultProps = defaultThemeProp;
 var LoadStatus;
 (function (LoadStatus) {
     LoadStatus["Init"] = "init";
@@ -69,13 +69,19 @@ const LocationView = (props) => {
             });
             marker.current?.setVisible(false);
             if (onClick)
-                map.current.addListener('click', event => {
-                    if (hasProp(event, 'placeId')) {
-                        getPlaceById(event.placeId).then(placeInfo => onClick?.({
-                            ...placeInfo,
-                            latitude: event.latLng.lat(),
-                            longitude: event.latLng.lng()
-                        }));
+                map.current.addListener('click', (event) => {
+                    if (event &&
+                        typeof event === 'object' &&
+                        hasProp(event, 'placeId') &&
+                        typeof event.placeId === 'string') {
+                        getPlaceById(event.placeId).then(placeInfo => {
+                            if (hasProp(event, 'latLng') && isLatLngObject(event.latLng))
+                                onClick?.({
+                                    ...placeInfo,
+                                    latitude: event.latLng.lat(),
+                                    longitude: event.latLng.lng()
+                                });
+                        });
                     }
                 });
         }
@@ -124,7 +130,7 @@ const LocationView = (props) => {
             onError?.(error);
         });
     }, [location, status, zoomLevel, disabled, centerMapOnChange, onError]);
-    return (_jsxs(StyledLocationView, { height: height, children: [_jsx(Flex, { as: StyledMap, ref: mapElemRef, height: height, disabled: disabled, status: status, eMessage: eMessage, ...restProps }), status === LoadStatus.Init && _jsx(Progress, { placement: 'local' }), status === LoadStatus.Error && eMessage && (_jsx(Status, { as: StyledLocationError, "aria-label": eMessage, variant: 'info', children: eMessage }))] }));
+    return (_jsxs(StyledLocationView, { height: height, children: [_jsx(StyledMap, { ref: mapElemRef, height: height, disabled: disabled, status: status, eMessage: eMessage, ...restProps }), status === LoadStatus.Init && _jsx(Progress, { placement: 'local' }), status === LoadStatus.Error && eMessage && (_jsx(Status, { as: StyledLocationError, "aria-label": eMessage, variant: 'info', children: eMessage }))] }));
 };
 export default LocationView;
 //# sourceMappingURL=LocationView.js.map

package/lib/components/Location/LocationView.js.map

@@ -1 +1 @@
-{"version":3,"file":"LocationView.js","sourceRoot":"","sources":["../../../src/components/Location/LocationView.tsx"],"names":[],"mappings":"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","sourcesContent":["import { FC, useContext, useRef, useState, useEffect, Ref } from 'react';\nimport styled, { css } from 'styled-components';\n\nimport { BaseProps } from '../../types';\nimport { defaultThemeProp } from '../../theme';\nimport { hasProp } from '../../utils';\nimport Progress from '../Progress';\nimport Flex from '../Flex';\nimport { Status } from '../Badges';\n\nimport { LatLng } from './types';\nimport { loadMapsAPI, getCoords, toGoogleLatLng, getPlaceById } from './utils';\nimport BaseLocationProps from './Location.types';\nimport MapsContext from './MapsContext';\n\nexport const StyledLocationError = styled.div`\n  position: absolute;\n  top: 40%;\n  left: 50%;\n  transform: translate(-50%, -50%);\n`;\n\nStyledLocationError.defaultProps = defaultThemeProp;\n\nexport const StyledLocationView = styled.div<{ height?: string }>(props => {\n  const { height, theme } = props;\n\n  return css`\n    height: ${height};\n    position: relative;\n    flex: auto;\n    border-radius: ${theme.base['border-radius']};\n    mask-image: radial-gradient(white, black);\n    -webkit-mask-image: radial-gradient(white, black);\n  `;\n});\n\nStyledLocationView.defaultProps = defaultThemeProp;\n\nconst StyledMap = styled.div<{\n  height?: string;\n  status: string;\n  disabled: boolean;\n  eMessage: string;\n}>(\n  ({\n    height,\n    disabled,\n    status,\n    eMessage,\n    theme: {\n      base: { 'disabled-opacity': disabledOpacity }\n    }\n  }) => {\n    return css`\n      height: ${height};\n      ${disabled &&\n      css`\n        opacity: ${disabledOpacity};\n      `}\n      ${status === 'error' &&\n      eMessage &&\n      css`\n        opacity: ${disabledOpacity};\n      `}\n    `;\n  }\n);\n\nexport interface LocationViewProps extends BaseLocationProps, BaseProps {\n  /**\n   * Location string as either coordinates, name of a place, or 'current' for the current location.\n   * @default 'current'\n   */\n  location?: LatLng | string | 'current';\n  /**\n   * Set to true to always center the map when the selected location changes. Toggling this from false to true will re-center map on the last pinned location.\n   * @default false\n   */\n  centerMapOnChange?: boolean;\n  /**\n   * Height of the map container.\n   * @default '25rem'\n   */\n  height?: string;\n  /**\n   * How much the map should zoom.\n   * @default 13\n   */\n  zoomLevel?: number;\n  /** Callback fired when user clicks on a location on the map. This function will be passed the coordinates of the location that was clicked. */\n  onClick?: (coords: {\n    latitude: number;\n    longitude: number;\n    name: string;\n    address?: string;\n  }) => void;\n}\n\nenum LoadStatus {\n  Init = 'init',\n  Ready = 'ready',\n  Error = 'error'\n}\n\nconst LocationView: FC<LocationViewProps> = (props: LocationViewProps) => {\n  const {\n    location = 'current',\n    zoomLevel = 13,\n    height = '25rem',\n    centerMapOnChange = false,\n    onClick,\n    onError,\n    disabled = false,\n    ...restProps\n  } = props;\n  const { name, ...providerOpts } = useContext(MapsContext);\n  const [status, setStatus] = useState<LoadStatus>(LoadStatus.Init);\n  const [eMessage, setEMessage] = useState('');\n  const mapElemRef = useRef<HTMLDivElement>();\n  const map = useRef<google.maps.Map<HTMLDivElement>>();\n  const marker = useRef<google.maps.Marker>();\n\n  function initialize(): void {\n    if (mapElemRef.current) {\n      const position = toGoogleLatLng({ latitude: 0, longitude: 0 });\n      map.current = new google.maps.Map(mapElemRef.current!, {\n        center: position,\n        zoom: 2,\n        draggable: !disabled\n      });\n      marker.current = new google.maps.Marker({\n        map: map.current,\n        position\n      });\n      marker.current?.setVisible(false);\n      if (onClick)\n        map.current.addListener<'click'>('click', event => {\n          if (hasProp(event, 'placeId')) {\n            getPlaceById(event.placeId).then(placeInfo =>\n              onClick?.({\n                ...placeInfo,\n                latitude: event.latLng.lat(),\n                longitude: event.latLng.lng()\n              })\n            );\n          }\n        });\n    }\n  }\n\n  useEffect(() => {\n    let unMounted = false;\n    loadMapsAPI(name, providerOpts)\n      .then(() => {\n        if (!unMounted) {\n          initialize();\n          setStatus(LoadStatus.Ready);\n        }\n      })\n      .catch((error: Error) => {\n        setStatus(LoadStatus.Error);\n        setEMessage(error.message);\n        onError?.(error);\n      });\n\n    return () => {\n      unMounted = true;\n      if (map.current) google.maps.event.clearInstanceListeners(map.current);\n    };\n  }, []);\n\n  useEffect(() => {\n    getCoords(location!)\n      .then(coords => {\n        if (map.current) {\n          map.current.setOptions({\n            zoom: zoomLevel,\n            draggable: !disabled\n          });\n          marker.current?.setPosition(toGoogleLatLng(coords));\n          marker.current?.setVisible(true);\n          if (centerMapOnChange) map.current.setCenter(toGoogleLatLng(coords));\n          if (status !== LoadStatus.Ready) setStatus(LoadStatus.Ready);\n        }\n      })\n      .catch((error: Error) => {\n        if (status !== LoadStatus.Error) setStatus(LoadStatus.Error);\n        marker.current?.setVisible(false);\n        setEMessage(error.message);\n        onError?.(error);\n      });\n  }, [location, status, zoomLevel, disabled, centerMapOnChange, onError]);\n\n  return (\n    <StyledLocationView height={height}>\n      <Flex\n        as={StyledMap}\n        ref={mapElemRef as Ref<Element>}\n        height={height}\n        disabled={disabled}\n        status={status}\n        eMessage={eMessage}\n        {...restProps}\n      />\n      {status === LoadStatus.Init && <Progress placement='local' />}\n      {status === LoadStatus.Error && eMessage && (\n        <Status as={StyledLocationError} aria-label={eMessage} variant='info'>\n          {eMessage}\n        </Status>\n      )}\n    </StyledLocationView>\n  );\n};\n\nexport default LocationView;\n"]}
+{"version":3,"file":"LocationView.js","sourceRoot":"","sources":["../../../src/components/Location/LocationView.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAM,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAO,MAAM,OAAO,CAAC;AACzE,OAAO,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGnC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE/F,OAAO,WAAW,MAAM,eAAe,CAAC;AAExC,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;CAK5C,CAAC;AAEF,mBAAmB,CAAC,YAAY,GAAG,gBAAgB,CAAC;AAEpD,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,GAAG,CAAsB,KAAK,CAAC,EAAE;IACxE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IAEhC,OAAO,GAAG,CAAA;cACE,MAAM;;;qBAGC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC;;;GAG7C,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,kBAAkB,CAAC,YAAY,GAAG,gBAAgB,CAAC;AAEnD,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAM1B,CAAC,EACC,MAAM,EACN,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,KAAK,EAAE,EACL,IAAI,EAAE,EAAE,kBAAkB,EAAE,eAAe,EAAE,EAC9C,EACF,EAAE,EAAE;IACH,OAAO,GAAG,CAAA;gBACE,MAAM;QACd,QAAQ;QACV,GAAG,CAAA;mBACU,eAAe;OAC3B;QACC,MAAM,KAAK,OAAO;QACpB,QAAQ;QACR,GAAG,CAAA;mBACU,eAAe;OAC3B;KACF,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,SAAS,CAAC,YAAY,GAAG,gBAAgB,CAAC;AAgC1C,IAAK,UAIJ;AAJD,WAAK,UAAU;IACb,2BAAa,CAAA;IACb,6BAAe,CAAA;IACf,6BAAe,CAAA;AACjB,CAAC,EAJI,UAAU,KAAV,UAAU,QAId;AAED,MAAM,YAAY,GAA0B,CAAC,KAAwB,EAAE,EAAE;IACvE,MAAM,EACJ,QAAQ,GAAG,SAAS,EACpB,SAAS,GAAG,EAAE,EACd,MAAM,GAAG,OAAO,EAChB,iBAAiB,GAAG,KAAK,EACzB,OAAO,EACP,OAAO,EACP,QAAQ,GAAG,KAAK,EAChB,GAAG,SAAS,EACb,GAAG,KAAK,CAAC;IACV,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;IAC1D,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAa,UAAU,CAAC,IAAI,CAAC,CAAC;IAClE,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC7C,MAAM,UAAU,GAAG,MAAM,EAAkB,CAAC;IAC5C,MAAM,GAAG,GAAG,MAAM,EAAmB,CAAC;IACtC,MAAM,MAAM,GAAG,MAAM,EAAsB,CAAC;IAE5C,SAAS,UAAU;QACjB,IAAI,UAAU,CAAC,OAAO,EAAE;YACtB,MAAM,QAAQ,GAAG,cAAc,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;YAC/D,GAAG,CAAC,OAAO,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,EAAE;gBACpD,MAAM,EAAE,QAAQ;gBAChB,IAAI,EAAE,CAAC;gBACP,SAAS,EAAE,CAAC,QAAQ;aACrB,CAAC,CAAC;YACH,MAAM,CAAC,OAAO,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;gBACtC,GAAG,EAAE,GAAG,CAAC,OAAO;gBAChB,QAAQ;aACT,CAAC,CAAC;YACH,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;YAClC,IAAI,OAAO;gBACT,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,KAAc,EAAE,EAAE;oBAClD,IACE,KAAK;wBACL,OAAO,KAAK,KAAK,QAAQ;wBACzB,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC;wBACzB,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,EACjC;wBACA,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;4BAC3C,IAAI,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC;gCAC1D,OAAO,EAAE,CAAC;oCACR,GAAG,SAAS;oCACZ,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE;oCAC5B,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE;iCAC9B,CAAC,CAAC;wBACP,CAAC,CAAC,CAAC;qBACJ;gBACH,CAAC,CAAC,CAAC;SACN;IACH,CAAC;IAED,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,WAAW,CAAC,IAAI,EAAE,YAAY,CAAC;aAC5B,IAAI,CAAC,GAAG,EAAE;YACT,IAAI,CAAC,SAAS,EAAE;gBACd,UAAU,EAAE,CAAC;gBACb,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;aAC7B;QACH,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAY,EAAE,EAAE;YACtB,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YAC5B,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC3B,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;QAEL,OAAO,GAAG,EAAE;YACV,SAAS,GAAG,IAAI,CAAC;YACjB,IAAI,GAAG,CAAC,OAAO;gBAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACzE,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,SAAS,CAAC,GAAG,EAAE;QACb,SAAS,CAAC,QAAS,CAAC;aACjB,IAAI,CAAC,MAAM,CAAC,EAAE;YACb,IAAI,GAAG,CAAC,OAAO,EAAE;gBACf,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC;oBACrB,IAAI,EAAE,SAAS;oBACf,SAAS,EAAE,CAAC,QAAQ;iBACrB,CAAC,CAAC;gBACH,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;gBACpD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;gBACjC,IAAI,iBAAiB;oBAAE,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;gBACrE,IAAI,MAAM,KAAK,UAAU,CAAC,KAAK;oBAAE,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;aAC9D;QACH,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAY,EAAE,EAAE;YACtB,IAAI,MAAM,KAAK,UAAU,CAAC,KAAK;gBAAE,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YAC7D,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;YAClC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC3B,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;IACP,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC;IAExE,OAAO,CACL,MAAC,kBAAkB,IAAC,MAAM,EAAE,MAAM,aAChC,KAAC,SAAS,IACR,GAAG,EAAE,UAAiC,EACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,KACd,SAAS,GACb,EACD,MAAM,KAAK,UAAU,CAAC,IAAI,IAAI,KAAC,QAAQ,IAAC,SAAS,EAAC,OAAO,GAAG,EAC5D,MAAM,KAAK,UAAU,CAAC,KAAK,IAAI,QAAQ,IAAI,CAC1C,KAAC,MAAM,IAAC,EAAE,EAAE,mBAAmB,gBAAc,QAAQ,EAAE,OAAO,EAAC,MAAM,YAClE,QAAQ,GACF,CACV,IACkB,CACtB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC","sourcesContent":["import { FC, useContext, useRef, useState, useEffect, Ref } from 'react';\nimport styled, { css } from 'styled-components';\n\nimport { BaseProps } from '../../types';\nimport { defaultThemeProp } from '../../theme';\nimport { hasProp } from '../../utils';\nimport Progress from '../Progress';\nimport { Status } from '../Badges';\n\nimport { LatLng } from './types';\nimport { loadMapsAPI, getCoords, toGoogleLatLng, getPlaceById, isLatLngObject } from './utils';\nimport BaseLocationProps from './Location.types';\nimport MapsContext from './MapsContext';\n\nexport const StyledLocationError = styled.div`\n  position: absolute;\n  top: 40%;\n  left: 50%;\n  transform: translate(-50%, -50%);\n`;\n\nStyledLocationError.defaultProps = defaultThemeProp;\n\nexport const StyledLocationView = styled.div<{ height?: string }>(props => {\n  const { height, theme } = props;\n\n  return css`\n    height: ${height};\n    position: relative;\n    flex: auto;\n    border-radius: ${theme.base['border-radius']};\n    mask-image: radial-gradient(white, black);\n    -webkit-mask-image: radial-gradient(white, black);\n  `;\n});\n\nStyledLocationView.defaultProps = defaultThemeProp;\n\nconst StyledMap = styled.div<{\n  height?: string;\n  status: string;\n  disabled: boolean;\n  eMessage: string;\n}>(\n  ({\n    height,\n    disabled,\n    status,\n    eMessage,\n    theme: {\n      base: { 'disabled-opacity': disabledOpacity }\n    }\n  }) => {\n    return css`\n      height: ${height};\n      ${disabled &&\n      css`\n        opacity: ${disabledOpacity};\n      `}\n      ${status === 'error' &&\n      eMessage &&\n      css`\n        opacity: ${disabledOpacity};\n      `}\n    `;\n  }\n);\n\nStyledMap.defaultProps = defaultThemeProp;\n\nexport interface LocationViewProps extends BaseLocationProps, BaseProps {\n  /**\n   * Location string as either coordinates, name of a place, or 'current' for the current location.\n   * @default 'current'\n   */\n  location?: LatLng | string | 'current';\n  /**\n   * Set to true to always center the map when the selected location changes. Toggling this from false to true will re-center map on the last pinned location.\n   * @default false\n   */\n  centerMapOnChange?: boolean;\n  /**\n   * Height of the map container.\n   * @default '25rem'\n   */\n  height?: string;\n  /**\n   * How much the map should zoom.\n   * @default 13\n   */\n  zoomLevel?: number;\n  /** Callback fired when user clicks on a location on the map. This function will be passed the coordinates of the location that was clicked. */\n  onClick?: (coords: {\n    latitude: number;\n    longitude: number;\n    name?: string;\n    address?: string;\n  }) => void;\n}\n\nenum LoadStatus {\n  Init = 'init',\n  Ready = 'ready',\n  Error = 'error'\n}\n\nconst LocationView: FC<LocationViewProps> = (props: LocationViewProps) => {\n  const {\n    location = 'current',\n    zoomLevel = 13,\n    height = '25rem',\n    centerMapOnChange = false,\n    onClick,\n    onError,\n    disabled = false,\n    ...restProps\n  } = props;\n  const { name, ...providerOpts } = useContext(MapsContext);\n  const [status, setStatus] = useState<LoadStatus>(LoadStatus.Init);\n  const [eMessage, setEMessage] = useState('');\n  const mapElemRef = useRef<HTMLDivElement>();\n  const map = useRef<google.maps.Map>();\n  const marker = useRef<google.maps.Marker>();\n\n  function initialize(): void {\n    if (mapElemRef.current) {\n      const position = toGoogleLatLng({ latitude: 0, longitude: 0 });\n      map.current = new google.maps.Map(mapElemRef.current, {\n        center: position,\n        zoom: 2,\n        draggable: !disabled\n      });\n      marker.current = new google.maps.Marker({\n        map: map.current,\n        position\n      });\n      marker.current?.setVisible(false);\n      if (onClick)\n        map.current.addListener('click', (event: unknown) => {\n          if (\n            event &&\n            typeof event === 'object' &&\n            hasProp(event, 'placeId') &&\n            typeof event.placeId === 'string'\n          ) {\n            getPlaceById(event.placeId).then(placeInfo => {\n              if (hasProp(event, 'latLng') && isLatLngObject(event.latLng))\n                onClick?.({\n                  ...placeInfo,\n                  latitude: event.latLng.lat(),\n                  longitude: event.latLng.lng()\n                });\n            });\n          }\n        });\n    }\n  }\n\n  useEffect(() => {\n    let unMounted = false;\n    loadMapsAPI(name, providerOpts)\n      .then(() => {\n        if (!unMounted) {\n          initialize();\n          setStatus(LoadStatus.Ready);\n        }\n      })\n      .catch((error: Error) => {\n        setStatus(LoadStatus.Error);\n        setEMessage(error.message);\n        onError?.(error);\n      });\n\n    return () => {\n      unMounted = true;\n      if (map.current) google.maps.event.clearInstanceListeners(map.current);\n    };\n  }, []);\n\n  useEffect(() => {\n    getCoords(location!)\n      .then(coords => {\n        if (map.current) {\n          map.current.setOptions({\n            zoom: zoomLevel,\n            draggable: !disabled\n          });\n          marker.current?.setPosition(toGoogleLatLng(coords));\n          marker.current?.setVisible(true);\n          if (centerMapOnChange) map.current.setCenter(toGoogleLatLng(coords));\n          if (status !== LoadStatus.Ready) setStatus(LoadStatus.Ready);\n        }\n      })\n      .catch((error: Error) => {\n        if (status !== LoadStatus.Error) setStatus(LoadStatus.Error);\n        marker.current?.setVisible(false);\n        setEMessage(error.message);\n        onError?.(error);\n      });\n  }, [location, status, zoomLevel, disabled, centerMapOnChange, onError]);\n\n  return (\n    <StyledLocationView height={height}>\n      <StyledMap\n        ref={mapElemRef as Ref<HTMLDivElement>}\n        height={height}\n        disabled={disabled}\n        status={status}\n        eMessage={eMessage}\n        {...restProps}\n      />\n      {status === LoadStatus.Init && <Progress placement='local' />}\n      {status === LoadStatus.Error && eMessage && (\n        <Status as={StyledLocationError} aria-label={eMessage} variant='info'>\n          {eMessage}\n        </Status>\n      )}\n    </StyledLocationView>\n  );\n};\n\nexport default LocationView;\n"]}

package/lib/components/Location/utils.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="googlemaps" />
+/// <reference types="google.maps" />
 import { Bias, LatLng, ProviderOpts } from './types';
 export declare function loadMapsAPI(name?: string, opts?: ProviderOpts): Promise<void>;
 export declare function getNavigatorPosition(): Promise<LatLng>;
@@ -12,7 +12,7 @@ export declare function getPlacePredictions(location: string, bias?: Bias): Prom
 }>;
 export declare function getPlace(location: string, mapElement?: HTMLDivElement): Promise<LatLng>;
 export declare function getPlaceById(placeId: string, sessionToken?: google.maps.places.AutocompleteSessionToken, mapElement?: HTMLDivElement): Promise<{
-    name: string;
+    name?: string;
     address?: string;
     latitude?: number;
     longitude?: number;
@@ -25,4 +25,5 @@ export declare function getAddress(coords: LatLng): Promise<{
     latitude?: number;
     longitude?: number;
 }>;
+export declare const isLatLngObject: (obj: unknown) => obj is google.maps.LatLng;
 //# sourceMappingURL=utils.d.ts.map

package/lib/components/Location/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/components/Location/utils.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,IAAI,EAMJ,MAAM,EAIN,YAAY,EAGb,MAAM,SAAS,CAAC;AAgDjB,wBAAsB,WAAW,CAAC,IAAI,GAAE,MAAW,EAAE,IAAI,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAYvF;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC,CAc5D;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAEjE;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,IAAS,GACd,OAAO,CAAC;IACT,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC;IAC9D,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC;CACpD,CAAC,CAwCD;AAED,wBAAsB,QAAQ,CAC5B,QAAQ,EAAE,MAAM,EAChB,UAAU,GAAE,cAA8C,GACzD,OAAO,CAAC,MAAM,CAAC,CAkBjB;AAED,wBAAsB,YAAY,CAChC,OAAO,EAAE,MAAM,EACf,YAAY,GAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,wBAA4E,EAC7G,UAAU,GAAE,cAA8C,GACzD,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAgBpF;AAED,0FAA0F;AAC1F,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,UAAU,CAAC,EAAE,cAAc,GAC1B,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAED,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAkCpF"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/components/Location/utils.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,IAAI,EAMJ,MAAM,EAIN,YAAY,EAGb,MAAM,SAAS,CAAC;AAgDjB,wBAAsB,WAAW,CAAC,IAAI,GAAE,MAAW,EAAE,IAAI,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAYvF;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC,CAc5D;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAEjE;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,IAAS,GACd,OAAO,CAAC;IACT,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC;IAC9D,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC;CACpD,CAAC,CAwCD;AAED,wBAAsB,QAAQ,CAC5B,QAAQ,EAAE,MAAM,EAChB,UAAU,GAAE,cAA8C,GACzD,OAAO,CAAC,MAAM,CAAC,CAkBjB;AAED,wBAAsB,YAAY,CAChC,OAAO,EAAE,MAAM,EACf,YAAY,GAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,wBAA4E,EAC7G,UAAU,GAAE,cAA8C,GACzD,OAAO,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAgBrF;AAED,0FAA0F;AAC1F,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,UAAU,CAAC,EAAE,cAAc,GAC1B,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAED,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAkCpF;AAED,eAAO,MAAM,cAAc,QAAS,OAAO,8BAS1C,CAAC"}

package/lib/components/Location/utils.js

@@ -1,4 +1,4 @@
-import { loadScript } from '../../utils';
+import { hasProp, loadScript } from '../../utils';
 import { CoordsCannotBeParsedError, GeocoderFailedError, GeolocationUnsupportedError, GoogleMapsAPINotFoundError, IsNotAnObjectError, LocationNotFoundError, ProviderNotSupportedError, QUERY_FIELDS, QUERY_TYPES } from './types';
 const GOOGLE_MAPS_SCRIPT_ID = 'google-map';
 const providers = {
@@ -94,7 +94,7 @@ export async function getPlacePredictions(location, bias = {}) {
             ...optionalParams
         }, (placePredictions, status) => {
             if (status === google.maps.places.PlacesServiceStatus.OK) {
-                resolve({ placePredictions, token });
+                resolve({ placePredictions: placePredictions ?? [], token });
             }
             else {
                 reject(new Error(LocationNotFoundError));
@@ -109,8 +109,8 @@ export async function getPlace(location, mapElement = document.createElement('di
         placesService.getDetails({ placeId: placePredictions[0]?.place_id, fields: QUERY_FIELDS, sessionToken: token }, (place, pStatus) => {
             if (pStatus === google.maps.places.PlacesServiceStatus.OK) {
                 resolve({
-                    latitude: place.geometry?.location.lat() || NaN,
-                    longitude: place.geometry?.location.lng() || NaN
+                    latitude: place?.geometry?.location?.lat() || NaN,
+                    longitude: place?.geometry?.location?.lng() || NaN
                 });
             }
             else {
@@ -125,10 +125,10 @@ export async function getPlaceById(placeId, sessionToken = new google.maps.place
         placesService.getDetails({ placeId, fields: QUERY_FIELDS, sessionToken }, (place, pStatus) => {
             if (pStatus === google.maps.places.PlacesServiceStatus.OK) {
                 resolve({
-                    name: place.name,
-                    address: place.formatted_address,
-                    latitude: place.geometry?.location.lat() || NaN,
-                    longitude: place.geometry?.location.lng() || NaN
+                    name: place?.name,
+                    address: place?.formatted_address,
+                    latitude: place?.geometry?.location?.lat() || NaN,
+                    longitude: place?.geometry?.location?.lng() || NaN
                 });
             }
             else {
@@ -166,7 +166,7 @@ export async function getAddress(coords) {
     return new Promise((resolve, reject) => {
         geocoder.geocode({ location }, (results, status) => {
             if (status === 'OK') {
-                const [result] = results;
+                const [result] = results ?? [];
                 if (result) {
                     resolve({
                         name: result.formatted_address,
@@ -191,4 +191,12 @@ export async function getAddress(coords) {
         });
     });
 }
+export const isLatLngObject = (obj) => {
+    return (!!obj &&
+        typeof obj === 'object' &&
+        hasProp(obj, 'lat') &&
+        typeof obj.lat === 'function' &&
+        hasProp(obj, 'lng') &&
+        typeof obj.lng === 'function');
+};
 //# sourceMappingURL=utils.js.map

package/lib/components/Location/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/components/Location/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { loadScript } from '../../utils';\n\nimport {\n  Bias,\n  CoordsCannotBeParsedError,\n  GeocoderFailedError,\n  GeolocationUnsupportedError,\n  GoogleMapsAPINotFoundError,\n  IsNotAnObjectError,\n  LatLng,\n  LocationNotFoundError,\n  MapsProvider,\n  ProviderNotSupportedError,\n  ProviderOpts,\n  QUERY_FIELDS,\n  QUERY_TYPES\n} from './types';\n\nconst GOOGLE_MAPS_SCRIPT_ID = 'google-map';\n\nconst providers: {\n  [key: string]: MapsProvider;\n} = {\n  google: {\n    name: 'Google',\n    loadedPromise: null,\n    loadedApiKey: '',\n    loadAPI(opts) {\n      const params = new URLSearchParams(\n        Object.entries({\n          key: opts.apiKey,\n          region: opts.region,\n          language: opts.language,\n          libraries: 'places'\n        }).filter(([, value]) => value !== undefined)\n      ).toString();\n\n      const loadedScript = document.getElementById(GOOGLE_MAPS_SCRIPT_ID);\n      if (loadedScript) {\n        loadedScript.remove();\n        // https://stackoverflow.com/questions/29930274/fixing-you-have-included-the-google-maps-api-multiple-times-on-this-page-this\n        delete (window as any).google;\n      }\n\n      return new Promise((resolve, reject) => {\n        loadScript(\n          `https://maps.googleapis.com/maps/api/js?${params}`,\n          function onLoad(this: HTMLScriptElement) {\n            this.id = GOOGLE_MAPS_SCRIPT_ID;\n            return resolve();\n          },\n          () => reject(new Error(GoogleMapsAPINotFoundError))\n        );\n      });\n    }\n  },\n  undefined: {\n    name: 'undefined',\n    loadedPromise: null,\n    loadedApiKey: '',\n    loadAPI: data => Promise.reject(new Error(`${ProviderNotSupportedError}: ${data.name}`))\n  }\n};\n\nexport async function loadMapsAPI(name: string = '', opts?: ProviderOpts): Promise<void> {\n  if (typeof opts !== 'object' || !opts) {\n    throw new Error(IsNotAnObjectError);\n  }\n\n  const provider = providers[name] ?? providers.undefined;\n\n  if (!provider.loadedPromise || provider.loadedApiKey !== opts?.apiKey) {\n    provider.loadedApiKey = opts?.apiKey;\n    provider.loadedPromise = provider.loadAPI(opts);\n  }\n  return provider.loadedPromise;\n}\n\nexport async function getNavigatorPosition(): Promise<LatLng> {\n  if (!navigator.geolocation) throw new Error(GeolocationUnsupportedError);\n\n  return new Promise((resolve, reject) => {\n    navigator.geolocation.getCurrentPosition(\n      currentLocation => {\n        resolve({\n          latitude: currentLocation.coords.latitude,\n          longitude: currentLocation.coords.longitude\n        });\n      },\n      error => reject(new Error(error.message))\n    );\n  });\n}\n\nexport function toGoogleLatLng(coords: LatLng): google.maps.LatLng {\n  return new google.maps.LatLng(coords.latitude, coords.longitude);\n}\n\n/** Returns an array of place prediction objects ('place' can be an establishment, geographic location, or prominent point of interest)\n * and  session token (valid for multiple queries, followed by one place selection).\n */\nexport async function getPlacePredictions(\n  location: string,\n  bias: Bias = {}\n): Promise<{\n  placePredictions: google.maps.places.AutocompletePrediction[];\n  token: google.maps.places.AutocompleteSessionToken;\n}> {\n  const autocompleteService = new google.maps.places.AutocompleteService();\n  const optionalParams: Partial<google.maps.places.AutocompletionRequest> = {};\n  if (bias?.location) {\n    if (bias?.location.center === 'current') {\n      await getNavigatorPosition()\n        .then(coords => {\n          optionalParams.location = toGoogleLatLng(coords);\n          optionalParams.radius = bias.location!.radius;\n        })\n        // no-op user didn't allow location\n        .catch(() => {});\n    } else {\n      optionalParams.location = toGoogleLatLng(bias.location.center);\n      optionalParams.radius = bias.location.radius;\n    }\n  }\n\n  if (bias?.bounds) {\n    const [sw, ne] = bias.bounds;\n    optionalParams.bounds = new google.maps.LatLngBounds(toGoogleLatLng(sw), toGoogleLatLng(ne));\n  }\n  return new Promise((resolve, reject) => {\n    const token = new google.maps.places.AutocompleteSessionToken();\n    autocompleteService.getPlacePredictions(\n      {\n        input: location,\n        types: QUERY_TYPES,\n        sessionToken: token,\n        ...optionalParams\n      },\n      (placePredictions, status) => {\n        if (status === google.maps.places.PlacesServiceStatus.OK) {\n          resolve({ placePredictions, token });\n        } else {\n          reject(new Error(LocationNotFoundError));\n        }\n      }\n    );\n  });\n}\n\nexport async function getPlace(\n  location: string,\n  mapElement: HTMLDivElement = document.createElement('div')\n): Promise<LatLng> {\n  const placesService = new google.maps.places.PlacesService(mapElement);\n  const { placePredictions, token } = await getPlacePredictions(location);\n  return new Promise((resolve, reject) => {\n    placesService.getDetails(\n      { placeId: placePredictions[0]?.place_id, fields: QUERY_FIELDS, sessionToken: token },\n      (place, pStatus) => {\n        if (pStatus === google.maps.places.PlacesServiceStatus.OK) {\n          resolve({\n            latitude: place.geometry?.location.lat() || NaN,\n            longitude: place.geometry?.location.lng() || NaN\n          });\n        } else {\n          reject(new Error(LocationNotFoundError));\n        }\n      }\n    );\n  });\n}\n\nexport async function getPlaceById(\n  placeId: string,\n  sessionToken: google.maps.places.AutocompleteSessionToken = new google.maps.places.AutocompleteSessionToken(),\n  mapElement: HTMLDivElement = document.createElement('div')\n): Promise<{ name: string; address?: string; latitude?: number; longitude?: number }> {\n  const placesService = new google.maps.places.PlacesService(mapElement);\n  return new Promise((resolve, reject) => {\n    placesService.getDetails({ placeId, fields: QUERY_FIELDS, sessionToken }, (place, pStatus) => {\n      if (pStatus === google.maps.places.PlacesServiceStatus.OK) {\n        resolve({\n          name: place.name,\n          address: place.formatted_address,\n          latitude: place.geometry?.location.lat() || NaN,\n          longitude: place.geometry?.location.lng() || NaN\n        });\n      } else {\n        reject(new Error(LocationNotFoundError));\n      }\n    });\n  });\n}\n\n/** Returns coordinations for given input: either coords, address or current position.  */\nexport async function getCoords(\n  coords: string | LatLng,\n  mapElement?: HTMLDivElement\n): Promise<LatLng> {\n  if (coords === '' || coords === undefined) throw new Error();\n  if (coords === 'current') return getNavigatorPosition();\n\n  let location: LatLng;\n  if (typeof coords === 'string') {\n    const [lat, lng] = coords.split(',', 2).map(Number);\n    if (Number.isNaN(lat) || Number.isNaN(lng) || lat === undefined || lng === undefined)\n      return getPlace(coords, mapElement);\n    location = { latitude: lat, longitude: lng };\n  } else {\n    location = coords;\n  }\n\n  if (Number.isFinite(location.latitude) && Number.isFinite(location.longitude)) return location;\n\n  throw new Error(CoordsCannotBeParsedError);\n}\n\nexport async function getAddress(\n  coords: LatLng\n): Promise<{ name: string; address?: string; latitude?: number; longitude?: number }> {\n  const location = {\n    lat: coords.latitude,\n    lng: coords.longitude\n  };\n  const geocoder = new google.maps.Geocoder();\n  return new Promise((resolve, reject) => {\n    geocoder.geocode(\n      { location },\n      (results: google.maps.GeocoderResult[], status: google.maps.GeocoderStatus) => {\n        if (status === 'OK') {\n          const [result] = results;\n          if (result) {\n            resolve({\n              name: result.formatted_address,\n              address: result.formatted_address,\n              ...(result.geometry && {\n                latitude: result.geometry.location.lat(),\n                longitude: result.geometry.location.lng()\n              })\n            });\n          } else {\n            resolve({\n              name: `${coords.latitude}, ${coords.longitude}`,\n              latitude: coords.latitude,\n              longitude: coords.longitude\n            });\n          }\n        } else {\n          reject(new Error(`${GeocoderFailedError}: ${status}`));\n        }\n      }\n    );\n  });\n}\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/components/Location/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { hasProp, loadScript } from '../../utils';\n\nimport {\n  Bias,\n  CoordsCannotBeParsedError,\n  GeocoderFailedError,\n  GeolocationUnsupportedError,\n  GoogleMapsAPINotFoundError,\n  IsNotAnObjectError,\n  LatLng,\n  LocationNotFoundError,\n  MapsProvider,\n  ProviderNotSupportedError,\n  ProviderOpts,\n  QUERY_FIELDS,\n  QUERY_TYPES\n} from './types';\n\nconst GOOGLE_MAPS_SCRIPT_ID = 'google-map';\n\nconst providers: {\n  [key: string]: MapsProvider;\n} = {\n  google: {\n    name: 'Google',\n    loadedPromise: null,\n    loadedApiKey: '',\n    loadAPI(opts) {\n      const params = new URLSearchParams(\n        Object.entries({\n          key: opts.apiKey,\n          region: opts.region,\n          language: opts.language,\n          libraries: 'places'\n        }).filter(([, value]) => value !== undefined)\n      ).toString();\n\n      const loadedScript = document.getElementById(GOOGLE_MAPS_SCRIPT_ID);\n      if (loadedScript) {\n        loadedScript.remove();\n        // https://stackoverflow.com/questions/29930274/fixing-you-have-included-the-google-maps-api-multiple-times-on-this-page-this\n        delete (window as any).google;\n      }\n\n      return new Promise((resolve, reject) => {\n        loadScript(\n          `https://maps.googleapis.com/maps/api/js?${params}`,\n          function onLoad(this: HTMLScriptElement) {\n            this.id = GOOGLE_MAPS_SCRIPT_ID;\n            return resolve();\n          },\n          () => reject(new Error(GoogleMapsAPINotFoundError))\n        );\n      });\n    }\n  },\n  undefined: {\n    name: 'undefined',\n    loadedPromise: null,\n    loadedApiKey: '',\n    loadAPI: data => Promise.reject(new Error(`${ProviderNotSupportedError}: ${data.name}`))\n  }\n};\n\nexport async function loadMapsAPI(name: string = '', opts?: ProviderOpts): Promise<void> {\n  if (typeof opts !== 'object' || !opts) {\n    throw new Error(IsNotAnObjectError);\n  }\n\n  const provider = providers[name] ?? providers.undefined;\n\n  if (!provider.loadedPromise || provider.loadedApiKey !== opts?.apiKey) {\n    provider.loadedApiKey = opts?.apiKey;\n    provider.loadedPromise = provider.loadAPI(opts);\n  }\n  return provider.loadedPromise;\n}\n\nexport async function getNavigatorPosition(): Promise<LatLng> {\n  if (!navigator.geolocation) throw new Error(GeolocationUnsupportedError);\n\n  return new Promise((resolve, reject) => {\n    navigator.geolocation.getCurrentPosition(\n      currentLocation => {\n        resolve({\n          latitude: currentLocation.coords.latitude,\n          longitude: currentLocation.coords.longitude\n        });\n      },\n      error => reject(new Error(error.message))\n    );\n  });\n}\n\nexport function toGoogleLatLng(coords: LatLng): google.maps.LatLng {\n  return new google.maps.LatLng(coords.latitude, coords.longitude);\n}\n\n/** Returns an array of place prediction objects ('place' can be an establishment, geographic location, or prominent point of interest)\n * and  session token (valid for multiple queries, followed by one place selection).\n */\nexport async function getPlacePredictions(\n  location: string,\n  bias: Bias = {}\n): Promise<{\n  placePredictions: google.maps.places.AutocompletePrediction[];\n  token: google.maps.places.AutocompleteSessionToken;\n}> {\n  const autocompleteService = new google.maps.places.AutocompleteService();\n  const optionalParams: Partial<google.maps.places.AutocompletionRequest> = {};\n  if (bias?.location) {\n    if (bias?.location.center === 'current') {\n      await getNavigatorPosition()\n        .then(coords => {\n          optionalParams.location = toGoogleLatLng(coords);\n          optionalParams.radius = bias.location!.radius;\n        })\n        // no-op user didn't allow location\n        .catch(() => {});\n    } else {\n      optionalParams.location = toGoogleLatLng(bias.location.center);\n      optionalParams.radius = bias.location.radius;\n    }\n  }\n\n  if (bias?.bounds) {\n    const [sw, ne] = bias.bounds;\n    optionalParams.bounds = new google.maps.LatLngBounds(toGoogleLatLng(sw), toGoogleLatLng(ne));\n  }\n  return new Promise((resolve, reject) => {\n    const token = new google.maps.places.AutocompleteSessionToken();\n    autocompleteService.getPlacePredictions(\n      {\n        input: location,\n        types: QUERY_TYPES,\n        sessionToken: token,\n        ...optionalParams\n      },\n      (placePredictions, status) => {\n        if (status === google.maps.places.PlacesServiceStatus.OK) {\n          resolve({ placePredictions: placePredictions ?? [], token });\n        } else {\n          reject(new Error(LocationNotFoundError));\n        }\n      }\n    );\n  });\n}\n\nexport async function getPlace(\n  location: string,\n  mapElement: HTMLDivElement = document.createElement('div')\n): Promise<LatLng> {\n  const placesService = new google.maps.places.PlacesService(mapElement);\n  const { placePredictions, token } = await getPlacePredictions(location);\n  return new Promise((resolve, reject) => {\n    placesService.getDetails(\n      { placeId: placePredictions[0]?.place_id, fields: QUERY_FIELDS, sessionToken: token },\n      (place, pStatus) => {\n        if (pStatus === google.maps.places.PlacesServiceStatus.OK) {\n          resolve({\n            latitude: place?.geometry?.location?.lat() || NaN,\n            longitude: place?.geometry?.location?.lng() || NaN\n          });\n        } else {\n          reject(new Error(LocationNotFoundError));\n        }\n      }\n    );\n  });\n}\n\nexport async function getPlaceById(\n  placeId: string,\n  sessionToken: google.maps.places.AutocompleteSessionToken = new google.maps.places.AutocompleteSessionToken(),\n  mapElement: HTMLDivElement = document.createElement('div')\n): Promise<{ name?: string; address?: string; latitude?: number; longitude?: number }> {\n  const placesService = new google.maps.places.PlacesService(mapElement);\n  return new Promise((resolve, reject) => {\n    placesService.getDetails({ placeId, fields: QUERY_FIELDS, sessionToken }, (place, pStatus) => {\n      if (pStatus === google.maps.places.PlacesServiceStatus.OK) {\n        resolve({\n          name: place?.name,\n          address: place?.formatted_address,\n          latitude: place?.geometry?.location?.lat() || NaN,\n          longitude: place?.geometry?.location?.lng() || NaN\n        });\n      } else {\n        reject(new Error(LocationNotFoundError));\n      }\n    });\n  });\n}\n\n/** Returns coordinations for given input: either coords, address or current position.  */\nexport async function getCoords(\n  coords: string | LatLng,\n  mapElement?: HTMLDivElement\n): Promise<LatLng> {\n  if (coords === '' || coords === undefined) throw new Error();\n  if (coords === 'current') return getNavigatorPosition();\n\n  let location: LatLng;\n  if (typeof coords === 'string') {\n    const [lat, lng] = coords.split(',', 2).map(Number);\n    if (Number.isNaN(lat) || Number.isNaN(lng) || lat === undefined || lng === undefined)\n      return getPlace(coords, mapElement);\n    location = { latitude: lat, longitude: lng };\n  } else {\n    location = coords;\n  }\n\n  if (Number.isFinite(location.latitude) && Number.isFinite(location.longitude)) return location;\n\n  throw new Error(CoordsCannotBeParsedError);\n}\n\nexport async function getAddress(\n  coords: LatLng\n): Promise<{ name: string; address?: string; latitude?: number; longitude?: number }> {\n  const location = {\n    lat: coords.latitude,\n    lng: coords.longitude\n  };\n  const geocoder = new google.maps.Geocoder();\n  return new Promise((resolve, reject) => {\n    geocoder.geocode(\n      { location },\n      (results: google.maps.GeocoderResult[] | null, status: google.maps.GeocoderStatus) => {\n        if (status === 'OK') {\n          const [result] = results ?? [];\n          if (result) {\n            resolve({\n              name: result.formatted_address,\n              address: result.formatted_address,\n              ...(result.geometry && {\n                latitude: result.geometry.location.lat(),\n                longitude: result.geometry.location.lng()\n              })\n            });\n          } else {\n            resolve({\n              name: `${coords.latitude}, ${coords.longitude}`,\n              latitude: coords.latitude,\n              longitude: coords.longitude\n            });\n          }\n        } else {\n          reject(new Error(`${GeocoderFailedError}: ${status}`));\n        }\n      }\n    );\n  });\n}\n\nexport const isLatLngObject = (obj: unknown): obj is google.maps.LatLng => {\n  return (\n    !!obj &&\n    typeof obj === 'object' &&\n    hasProp(obj, 'lat') &&\n    typeof obj.lat === 'function' &&\n    hasProp(obj, 'lng') &&\n    typeof obj.lng === 'function'\n  );\n};\n"]}

package/lib/components/Menu/FlyoutMenuList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FlyoutMenuList.d.ts","sourceRoot":"","sources":["../../../src/components/Menu/FlyoutMenuList.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAUlB,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAM3C,OAAO,EAAE,aAAa,EAAuB,MAAM,cAAc,CAAC;AAQlE,QAAA,MAAM,cAAc,EAAE,iBAAiB,CAAC,aAAa,GAAG,YAAY,CAoInE,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"FlyoutMenuList.d.ts","sourceRoot":"","sources":["../../../src/components/Menu/FlyoutMenuList.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAUlB,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAM3C,OAAO,EAAE,aAAa,EAAuB,MAAM,cAAc,CAAC;AAQlE,QAAA,MAAM,cAAc,EAAE,iBAAiB,CAAC,aAAa,GAAG,YAAY,CAgJnE,CAAC;AAEF,eAAe,cAAc,CAAC"}

package/lib/components/Menu/FlyoutMenuList.js

@@ -11,13 +11,13 @@ import { StyledLoadingItem, StyledMenuList, StyledFlyoutMenuListContainer } from
 import { resizeRootEl } from './NavItemsList';
 import helpers from './helpers';
 import MenuGroup from './MenuGroup';
-const FlyoutMenuList = forwardRef(({ items, parent }, ref) => {
+const FlyoutMenuList = forwardRef(({ items, parent, menuRole }, ref) => {
     const selfRef = useConsolidatedRef(ref);
     const ulRef = useRef(null);
     const menuListWrapperRef = useRef(null);
     const returnFocusRef = useRef(null);
     const [expandedItem, setExpandedItem] = useState();
-    const { componentId, loadMore, loading, scrollAt, emptyText, onItemExpand, pushFlyoutId, flyOutActiveIdStack } = useContext(MenuContext);
+    const { componentId, loadMore, loading, scrollAt, emptyText, onItemExpand, pushFlyoutId, flyOutActiveIdStack, updateActiveDescendants, updateParentDescendantStack } = useContext(MenuContext);
     useItemIntersection(ulRef, items.length - 1, () => {
         loadMore?.(parent?.item?.id);
     }, ':scope > li');
@@ -38,27 +38,31 @@ const FlyoutMenuList = forwardRef(({ items, parent }, ref) => {
     const listContent = useMemo(() => {
         if (items.length) {
             return items.map(item => {
-                return helpers.isItem(item) ? (_createElement(MenuItem, { ...item, key: item.id, "aria-haspopup": !!item.items, "aria-expanded": item.id === expandedItem?.id, onExpand: (id, e) => {
+                return helpers.isItem(item) ? (_createElement(MenuItem, { ...item, key: item.id, "aria-haspopup": !!item.items, "aria-expanded": item.id === expandedItem?.id, role: menuRole === 'listbox' ? 'option' : 'menuitem', onExpand: (id, e) => {
                         if (item.items) {
                             returnFocusRef.current = e.currentTarget;
                             setExpandedItem(item); // FIXME
                             item?.onExpand?.(id, e);
                             onItemExpand?.(id, e);
                             pushFlyoutId(item.id || componentId);
+                            updateActiveDescendants();
+                            if (updateParentDescendantStack) {
+                                updateParentDescendantStack(returnFocusRef.current.closest('li'));
+                            }
                         }
                         else {
                             returnFocusRef.current = null;
                             setExpandedItem(undefined);
                         }
-                    } })) : (_createElement(MenuGroup, { ...item, key: item.id }));
+                    } })) : (_createElement(MenuGroup, { ...item, key: item.id, itemRole: menuRole === 'listbox' ? 'option' : 'menuitem' }));
             });
         }
         if (!loading) {
             return _jsx(EmptyState, { message: emptyText, forwardedAs: 'li' });
         }
         return null;
-    }, [items, loading, emptyText, expandedItem]);
-    const list = (_jsxs(StyledMenuList, { ref: ulRef, children: [listContent, loading && !expandedItem && (_jsx(StyledLoadingItem, { children: _jsx(Progress, { placement: 'local' }) }))] }));
+    }, [items, loading, emptyText, expandedItem, flyOutActiveIdStack]);
+    const list = (_jsxs(StyledMenuList, { ref: ulRef, role: menuRole, children: [listContent, loading && !expandedItem && (_jsx(StyledLoadingItem, { children: _jsx(Progress, { placement: 'local' }) }))] }));
     useLayoutEffect(() => {
         setExpandedItem(undefined);
         if (selfRef.current) {
@@ -77,7 +81,7 @@ const FlyoutMenuList = forwardRef(({ items, parent }, ref) => {
                         siblingItems: items,
                         setExpandedItem,
                         returnFocusRef
-                    } }) }))] }));
+                    }, menuRole: menuRole }) }))] }));
 });
 export default FlyoutMenuList;
 //# sourceMappingURL=FlyoutMenuList.js.map

package/lib/components/Menu/FlyoutMenuList.js.map

@@ -1 +1 @@
-{"version":3,"file":"FlyoutMenuList.js","sourceRoot":"","sources":["../../../src/components/Menu/FlyoutMenuList.tsx"],"names":[],"mappings":"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","sourcesContent":["import {\n  forwardRef,\n  FunctionComponent,\n  MutableRefObject,\n  PropsWithoutRef,\n  useContext,\n  useEffect,\n  useRef,\n  useState,\n  useMemo,\n  useCallback,\n  useLayoutEffect\n} from 'react';\n\nimport { ForwardProps } from '../../types';\nimport { useAfterInitialEffect, useConsolidatedRef, useItemIntersection } from '../../hooks';\nimport Progress from '../Progress';\nimport EmptyState from '../EmptyState';\nimport Popover from '../Popover';\n\nimport { MenuListProps, ParentMenuItemProps } from './Menu.types';\nimport MenuContext from './Menu.context';\nimport MenuItem from './MenuItem';\nimport { StyledLoadingItem, StyledMenuList, StyledFlyoutMenuListContainer } from './Menu.styles';\nimport { resizeRootEl } from './NavItemsList';\nimport helpers from './helpers';\nimport MenuGroup from './MenuGroup';\n\nconst FlyoutMenuList: FunctionComponent<MenuListProps & ForwardProps> = forwardRef(\n  ({ items, parent }: PropsWithoutRef<MenuListProps>, ref: MenuListProps['ref']) => {\n    const selfRef = useConsolidatedRef(ref);\n    const ulRef = useRef<HTMLUListElement>(null);\n    const menuListWrapperRef: MutableRefObject<HTMLElement | null> = useRef(null);\n    const returnFocusRef: MutableRefObject<HTMLButtonElement | null> = useRef(null);\n    const [expandedItem, setExpandedItem] = useState<ParentMenuItemProps>();\n    const {\n      componentId,\n      loadMore,\n      loading,\n      scrollAt,\n      emptyText,\n      onItemExpand,\n      pushFlyoutId,\n      flyOutActiveIdStack\n    } = useContext(MenuContext);\n\n    useItemIntersection(\n      ulRef,\n      items.length - 1,\n      () => {\n        loadMore?.(parent?.item?.id);\n      },\n      ':scope > li'\n    );\n\n    useAfterInitialEffect(() => {\n      if (expandedItem) {\n        setExpandedItem(items.find(item => item.id === expandedItem.id) as ParentMenuItemProps); // FIXME\n      }\n    }, [expandedItem, items]);\n\n    useEffect(() => {\n      const hasExpanded = items.some(item => {\n        return flyOutActiveIdStack.includes(item.id);\n      });\n\n      if (!hasExpanded) {\n        returnFocusRef.current = null;\n        setExpandedItem(undefined);\n      }\n    }, [flyOutActiveIdStack]);\n\n    const listContent = useMemo(() => {\n      if (items.length) {\n        return items.map(item => {\n          return helpers.isItem(item) ? (\n            <MenuItem\n              {...item}\n              key={item.id}\n              aria-haspopup={!!item.items}\n              aria-expanded={item.id === expandedItem?.id}\n              onExpand={(id, e) => {\n                if (item.items) {\n                  returnFocusRef.current = e.currentTarget as HTMLButtonElement;\n                  setExpandedItem(item as ParentMenuItemProps); // FIXME\n                  item?.onExpand?.(id, e);\n                  onItemExpand?.(id, e);\n                  pushFlyoutId(item.id || componentId);\n                } else {\n                  returnFocusRef.current = null;\n                  setExpandedItem(undefined);\n                }\n              }}\n            />\n          ) : (\n            <MenuGroup {...item} key={item.id} />\n          );\n        });\n      }\n\n      if (!loading) {\n        return <EmptyState message={emptyText} forwardedAs='li' />;\n      }\n\n      return null;\n    }, [items, loading, emptyText, expandedItem]);\n\n    const list = (\n      <StyledMenuList ref={ulRef}>\n        {listContent}\n        {loading && !expandedItem && (\n          <StyledLoadingItem>\n            <Progress placement='local' />\n          </StyledLoadingItem>\n        )}\n      </StyledMenuList>\n    );\n\n    useLayoutEffect(() => {\n      setExpandedItem(undefined);\n      if (selfRef.current) {\n        menuListWrapperRef.current = selfRef.current.parentElement;\n        resizeRootEl(selfRef.current, selfRef.current, items.length, scrollAt);\n      }\n    }, [items]);\n\n    const handleMenuListScroll = useCallback(() => {\n      if (expandedItem) {\n        setExpandedItem(undefined);\n      }\n    }, [expandedItem]);\n\n    return (\n      <>\n        <StyledFlyoutMenuListContainer\n          ref={selfRef}\n          onScroll={handleMenuListScroll}\n          data-flyout-menu-parent-id={componentId}\n          data-flyout-menu-id={parent?.item.id || componentId}\n        >\n          {list}\n        </StyledFlyoutMenuListContainer>\n\n        {expandedItem && selfRef.current && (\n          <Popover target={returnFocusRef.current} show strategy='fixed' placement='right-start'>\n            <FlyoutMenuList\n              items={expandedItem.items}\n              parent={{\n                el: selfRef.current,\n                item: expandedItem,\n                siblingItems: items,\n                setExpandedItem,\n                returnFocusRef\n              }}\n            />\n          </Popover>\n        )}\n      </>\n    );\n  }\n);\n\nexport default FlyoutMenuList;\n"]}
+{"version":3,"file":"FlyoutMenuList.js","sourceRoot":"","sources":["../../../src/components/Menu/FlyoutMenuList.tsx"],"names":[],"mappings":"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","sourcesContent":["import {\n  forwardRef,\n  FunctionComponent,\n  MutableRefObject,\n  PropsWithoutRef,\n  useContext,\n  useEffect,\n  useRef,\n  useState,\n  useMemo,\n  useCallback,\n  useLayoutEffect\n} from 'react';\n\nimport { ForwardProps } from '../../types';\nimport { useAfterInitialEffect, useConsolidatedRef, useItemIntersection } from '../../hooks';\nimport Progress from '../Progress';\nimport EmptyState from '../EmptyState';\nimport Popover from '../Popover';\n\nimport { MenuListProps, ParentMenuItemProps } from './Menu.types';\nimport MenuContext from './Menu.context';\nimport MenuItem from './MenuItem';\nimport { StyledLoadingItem, StyledMenuList, StyledFlyoutMenuListContainer } from './Menu.styles';\nimport { resizeRootEl } from './NavItemsList';\nimport helpers from './helpers';\nimport MenuGroup from './MenuGroup';\n\nconst FlyoutMenuList: FunctionComponent<MenuListProps & ForwardProps> = forwardRef(\n  ({ items, parent, menuRole }: PropsWithoutRef<MenuListProps>, ref: MenuListProps['ref']) => {\n    const selfRef = useConsolidatedRef(ref);\n    const ulRef = useRef<HTMLUListElement>(null);\n    const menuListWrapperRef: MutableRefObject<HTMLElement | null> = useRef(null);\n    const returnFocusRef: MutableRefObject<HTMLButtonElement | null> = useRef(null);\n    const [expandedItem, setExpandedItem] = useState<ParentMenuItemProps>();\n    const {\n      componentId,\n      loadMore,\n      loading,\n      scrollAt,\n      emptyText,\n      onItemExpand,\n      pushFlyoutId,\n      flyOutActiveIdStack,\n      updateActiveDescendants,\n      updateParentDescendantStack\n    } = useContext(MenuContext);\n\n    useItemIntersection(\n      ulRef,\n      items.length - 1,\n      () => {\n        loadMore?.(parent?.item?.id);\n      },\n      ':scope > li'\n    );\n\n    useAfterInitialEffect(() => {\n      if (expandedItem) {\n        setExpandedItem(items.find(item => item.id === expandedItem.id) as ParentMenuItemProps); // FIXME\n      }\n    }, [expandedItem, items]);\n\n    useEffect(() => {\n      const hasExpanded = items.some(item => {\n        return flyOutActiveIdStack.includes(item.id);\n      });\n\n      if (!hasExpanded) {\n        returnFocusRef.current = null;\n        setExpandedItem(undefined);\n      }\n    }, [flyOutActiveIdStack]);\n\n    const listContent = useMemo(() => {\n      if (items.length) {\n        return items.map(item => {\n          return helpers.isItem(item) ? (\n            <MenuItem\n              {...item}\n              key={item.id}\n              aria-haspopup={!!item.items}\n              aria-expanded={item.id === expandedItem?.id}\n              role={menuRole === 'listbox' ? 'option' : 'menuitem'}\n              onExpand={(id, e) => {\n                if (item.items) {\n                  returnFocusRef.current = e.currentTarget as HTMLButtonElement;\n                  setExpandedItem(item as ParentMenuItemProps); // FIXME\n                  item?.onExpand?.(id, e);\n                  onItemExpand?.(id, e);\n                  pushFlyoutId(item.id || componentId);\n                  updateActiveDescendants();\n                  if (updateParentDescendantStack) {\n                    updateParentDescendantStack(returnFocusRef.current.closest('li'));\n                  }\n                } else {\n                  returnFocusRef.current = null;\n                  setExpandedItem(undefined);\n                }\n              }}\n            />\n          ) : (\n            <MenuGroup\n              {...item}\n              key={item.id}\n              itemRole={menuRole === 'listbox' ? 'option' : 'menuitem'}\n            />\n          );\n        });\n      }\n\n      if (!loading) {\n        return <EmptyState message={emptyText} forwardedAs='li' />;\n      }\n\n      return null;\n    }, [items, loading, emptyText, expandedItem, flyOutActiveIdStack]);\n\n    const list = (\n      <StyledMenuList ref={ulRef} role={menuRole}>\n        {listContent}\n        {loading && !expandedItem && (\n          <StyledLoadingItem>\n            <Progress placement='local' />\n          </StyledLoadingItem>\n        )}\n      </StyledMenuList>\n    );\n\n    useLayoutEffect(() => {\n      setExpandedItem(undefined);\n      if (selfRef.current) {\n        menuListWrapperRef.current = selfRef.current.parentElement;\n        resizeRootEl(selfRef.current, selfRef.current, items.length, scrollAt);\n      }\n    }, [items]);\n\n    const handleMenuListScroll = useCallback(() => {\n      if (expandedItem) {\n        setExpandedItem(undefined);\n      }\n    }, [expandedItem]);\n\n    return (\n      <>\n        <StyledFlyoutMenuListContainer\n          ref={selfRef}\n          onScroll={handleMenuListScroll}\n          data-flyout-menu-parent-id={componentId}\n          data-flyout-menu-id={parent?.item.id || componentId}\n        >\n          {list}\n        </StyledFlyoutMenuListContainer>\n\n        {expandedItem && selfRef.current && (\n          <Popover target={returnFocusRef.current} show strategy='fixed' placement='right-start'>\n            <FlyoutMenuList\n              items={expandedItem.items}\n              parent={{\n                el: selfRef.current,\n                item: expandedItem,\n                siblingItems: items,\n                setExpandedItem,\n                returnFocusRef\n              }}\n              menuRole={menuRole}\n            />\n          </Popover>\n        )}\n      </>\n    );\n  }\n);\n\nexport default FlyoutMenuList;\n"]}

package/lib/components/Menu/Menu.context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Menu.context.d.ts","sourceRoot":"","sources":["../../../src/components/Menu/Menu.context.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;;AAEhD,wBAaG"}
+{"version":3,"file":"Menu.context.d.ts","sourceRoot":"","sources":["../../../src/components/Menu/Menu.context.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;;AAEhD,wBAcG"}

package/lib/components/Menu/Menu.context.js

@@ -12,6 +12,7 @@ export default createContext({
     updateActiveDescendants: () => null,
     setFocusDescendant: () => null,
     setFocusReturnEl: () => null,
-    getScopedItemId: () => ''
+    getScopedItemId: () => '',
+    updateParentDescendantStack: () => null
 });
 //# sourceMappingURL=Menu.context.js.map

package/lib/components/Menu/Menu.context.js.map

@@ -1 +1 @@
-{"version":3,"file":"Menu.context.js","sourceRoot":"","sources":["../../../src/components/Menu/Menu.context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAIxC,eAAe,aAAa,CAAmB;IAC7C,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,YAAY;IACrB,QAAQ,EAAE,CAAC;IACX,OAAO,EAAE,KAAK;IACd,WAAW,EAAE,SAAS,EAAE;IACxB,YAAY,EAAE,GAAG,EAAE,CAAC,IAAI;IACxB,mBAAmB,EAAE,EAAE;IACvB,YAAY,EAAE,IAAI;IAClB,uBAAuB,EAAE,GAAG,EAAE,CAAC,IAAI;IACnC,kBAAkB,EAAE,GAAG,EAAE,CAAC,IAAI;IAC9B,gBAAgB,EAAE,GAAG,EAAE,CAAC,IAAI;IAC5B,eAAe,EAAE,GAAG,EAAE,CAAC,EAAE;CAC1B,CAAC,CAAC","sourcesContent":["import { createContext } from 'react';\n\nimport { createUID } from '../../utils';\n\nimport { MenuContextProps } from './Menu.types';\n\nexport default createContext<MenuContextProps>({\n  mode: 'action',\n  variant: 'drill-down',\n  scrollAt: 7,\n  loading: false,\n  componentId: createUID(),\n  pushFlyoutId: () => null,\n  flyOutActiveIdStack: [],\n  focusControl: null,\n  updateActiveDescendants: () => null,\n  setFocusDescendant: () => null,\n  setFocusReturnEl: () => null,\n  getScopedItemId: () => ''\n});\n"]}
+{"version":3,"file":"Menu.context.js","sourceRoot":"","sources":["../../../src/components/Menu/Menu.context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAIxC,eAAe,aAAa,CAAmB;IAC7C,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,YAAY;IACrB,QAAQ,EAAE,CAAC;IACX,OAAO,EAAE,KAAK;IACd,WAAW,EAAE,SAAS,EAAE;IACxB,YAAY,EAAE,GAAG,EAAE,CAAC,IAAI;IACxB,mBAAmB,EAAE,EAAE;IACvB,YAAY,EAAE,IAAI;IAClB,uBAAuB,EAAE,GAAG,EAAE,CAAC,IAAI;IACnC,kBAAkB,EAAE,GAAG,EAAE,CAAC,IAAI;IAC9B,gBAAgB,EAAE,GAAG,EAAE,CAAC,IAAI;IAC5B,eAAe,EAAE,GAAG,EAAE,CAAC,EAAE;IACzB,2BAA2B,EAAE,GAAG,EAAE,CAAC,IAAI;CACxC,CAAC,CAAC","sourcesContent":["import { createContext } from 'react';\n\nimport { createUID } from '../../utils';\n\nimport { MenuContextProps } from './Menu.types';\n\nexport default createContext<MenuContextProps>({\n  mode: 'action',\n  variant: 'drill-down',\n  scrollAt: 7,\n  loading: false,\n  componentId: createUID(),\n  pushFlyoutId: () => null,\n  flyOutActiveIdStack: [],\n  focusControl: null,\n  updateActiveDescendants: () => null,\n  setFocusDescendant: () => null,\n  setFocusReturnEl: () => null,\n  getScopedItemId: () => '',\n  updateParentDescendantStack: () => null\n});\n"]}

package/lib/components/Menu/Menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Menu.d.ts","sourceRoot":"","sources":["../../../src/components/Menu/Menu.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAOlB,MAAM,OAAO,CAAC;AAWf,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAM3C,OAAO,EAAoB,SAAS,EAAE,MAAM,cAAc,CAAC;AAG3D,QAAA,MAAM,IAAI,EAAE,iBAAiB,CAAC,SAAS,GAAG,YAAY,CA4SrD,CAAC;AAEF,eAAe,IAAI,CAAC"}
+{"version":3,"file":"Menu.d.ts","sourceRoot":"","sources":["../../../src/components/Menu/Menu.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAOlB,MAAM,OAAO,CAAC;AAWf,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAO3C,OAAO,EAAoB,SAAS,EAAE,MAAM,cAAc,CAAC;AAG3D,QAAA,MAAM,IAAI,EAAE,iBAAiB,CAAC,SAAS,GAAG,YAAY,CA2VrD,CAAC;AAEF,eAAe,IAAI,CAAC"}

package/lib/components/Menu/Menu.js

@@ -2,13 +2,14 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { forwardRef, useCallback, useEffect, useState, useRef, useMemo } from 'react';
 import { useConsolidatedRef, useUID, useActiveDescendant, useLazyDescendant, useI18n, usePrevious, useDirection } from '../../hooks';
 import { cap } from '../../utils';
+import VisuallyHiddenText from '../VisuallyHiddenText';
 import FlyoutMenuList from './FlyoutMenuList';
 import MenuContext from './Menu.context';
 import { StyledMenu, StyledMenuListWrapper } from './Menu.styles';
 import MenuList from './MenuList';
 const Menu = forwardRef((props, ref) => {
     const uid = useUID();
-    const { id = uid, items = [], mode = 'action', accent, scrollAt = 7, emptyText, onItemClick, onItemActive, onItemExpand, loadMore, onItemCollapse, loading = false, currentItemId, header, footer, variant = 'drill-down', focusControlEl, focusElOnClose = true, arrowNavigationUnsupported, 'aria-describedby': ariaDescribedBy, ...restProps } = props;
+    const { id = uid, items = [], mode = 'action', accent, scrollAt = 7, emptyText, onItemClick, onItemActive, onItemExpand, loadMore, onItemCollapse, loading = false, currentItemId, header, footer, variant = 'drill-down', focusControlEl, focusElOnClose = true, arrowNavigationUnsupported, 'aria-describedby': ariaDescribedBy, 'aria-label': label, role = 'menu', listId, pauseDescendantEvaluation, ...restProps } = props;
     const t = useI18n();
     const { end: endDirection, start: startDirection } = useDirection();
     const radioName = useUID();
@@ -19,6 +20,7 @@ const Menu = forwardRef((props, ref) => {
     const [flyOutActiveIdStack, setFlyoutActiveIdStack] = useState([id]);
     const [focusReturnEl, setFocusReturnEl] = useState();
     const [preventInitialScroll, setPreventInitialScroll] = useState(false);
+    const [flyoutFocusReturnStack, setFlyoutFocusReturnStack] = useState([]);
     const activeFlyoutSelector = useMemo(() => `fieldset[data-flyout-menu-id="${flyOutActiveIdStack[flyOutActiveIdStack.length - 1]}"]`, [flyOutActiveIdStack]);
     const focusControl = useMemo(() => {
         return focusControlEl || menuRef.current;
@@ -26,6 +28,12 @@ const Menu = forwardRef((props, ref) => {
     const pushFlyoutId = useCallback((flyoutId) => {
         setFlyoutActiveIdStack([...flyOutActiveIdStack, flyoutId]);
     }, [flyOutActiveIdStack]);
+    useEffect(() => {
+        setFlyoutActiveIdStack([...flyOutActiveIdStack, id]);
+    }, [id]);
+    const updateParentDescendantStack = useCallback((item) => {
+        setFlyoutFocusReturnStack([...flyoutFocusReturnStack, item]);
+    }, [flyoutFocusReturnStack]);
     const getScopedItemId = useCallback((itemId) => {
         return `${id}-item-${itemId}`;
     }, [id]);
@@ -42,7 +50,7 @@ const Menu = forwardRef((props, ref) => {
         scopeSelector: variant === 'drill-down'
             ? 'fieldset[aria-hidden="false"]'
             : activeFlyoutSelector,
-        selector: '[role="menuitem"], legend button',
+        selector: `[role="${role === 'menu' ? 'menuitem' : 'option'}"], legend button`,
         focusDescendantEl: focusDescendant,
         clearFocusDescendant: () => {
             setFocusDescendant(null);
@@ -57,7 +65,8 @@ const Menu = forwardRef((props, ref) => {
         preventInitialScroll,
         clearPreventScroll: () => {
             setPreventInitialScroll(false);
-        }
+        },
+        pauseDescendantEvaluation
     }), [
         focusControl,
         menuRef.current,
@@ -65,7 +74,8 @@ const Menu = forwardRef((props, ref) => {
         focusReturnEl,
         focusDescendant,
         currentItemId,
-        preventInitialScroll
+        preventInitialScroll,
+        pauseDescendantEvaluation
     ]);
     const { activeDescendant, descendants } = useActiveDescendant(uadConfig, [
         activeDescendantUpdateId
@@ -90,8 +100,18 @@ const Menu = forwardRef((props, ref) => {
                     return;
                 }
                 // collapse
-                if (activeDescendant.dataset.collapse === 'true' && action !== 'expand') {
-                    activeDescendant.click();
+                if (action !== 'expand') {
+                    if (variant === 'flyout' &&
+                        flyOutActiveIdStack.length > 1 &&
+                        flyoutFocusReturnStack.length > 0) {
+                        setFlyoutActiveIdStack([...flyOutActiveIdStack].slice(0, -1));
+                        const parentDescendant = flyoutFocusReturnStack.pop();
+                        if (parentDescendant !== undefined)
+                            setFocusReturnEl(parentDescendant);
+                        updateActiveDescendants();
+                    }
+                    else if (activeDescendant.dataset.collapse === 'true')
+                        activeDescendant.click();
                 }
             }
         };
@@ -110,12 +130,16 @@ const Menu = forwardRef((props, ref) => {
                     break;
                 }
                 case 'Escape': {
-                    if (variant === 'flyout' && flyOutActiveIdStack.length > 1) {
+                    if (variant === 'flyout' &&
+                        flyOutActiveIdStack.length > 1 &&
+                        flyoutFocusReturnStack.length > 0) {
                         e.preventDefault();
                         e.stopPropagation();
-                        const newStack = [...flyOutActiveIdStack];
-                        newStack.pop();
-                        setFlyoutActiveIdStack(newStack);
+                        setFlyoutActiveIdStack([...flyOutActiveIdStack].slice(0, -1));
+                        const parentDescendant = flyoutFocusReturnStack.pop();
+                        if (parentDescendant !== undefined)
+                            setFocusReturnEl(parentDescendant);
+                        updateActiveDescendants();
                     }
                     break;
                 }
@@ -131,11 +155,11 @@ const Menu = forwardRef((props, ref) => {
             onItemActive?.(getUnscopedItemId(activeDescendant.id));
         focusControl?.addEventListener('keydown', additionalKeydown);
         return () => focusControl?.removeEventListener('keydown', additionalKeydown);
-    }, [focusControl, activeDescendant]);
+    }, [focusControl, activeDescendant, flyOutActiveIdStack]);
     // ## Update useActiveDescendant on change of items, not selection of items.
     useEffect(() => {
         // Next tick for DOM updates.
-        setTimeout(() => {
+        const timeoutId = setTimeout(() => {
             if (items.length === previousItemCount.current) {
                 const previousDescendantIds = descendants?.map(node => node.id);
                 const newDescendants = uadConfig.scope
@@ -159,6 +183,7 @@ const Menu = forwardRef((props, ref) => {
             previousItemCount.current = items.length;
             updateActiveDescendants();
         }, 0);
+        return () => clearTimeout(timeoutId);
     }, [items]);
     const contextValue = useMemo(() => {
         return {
@@ -182,7 +207,8 @@ const Menu = forwardRef((props, ref) => {
             setFocusDescendant,
             getScopedItemId,
             pushFlyoutId,
-            flyOutActiveIdStack
+            flyOutActiveIdStack,
+            updateParentDescendantStack
         };
     }, [
         id,
@@ -205,9 +231,10 @@ const Menu = forwardRef((props, ref) => {
         setFocusDescendant,
         getScopedItemId,
         pushFlyoutId,
-        flyOutActiveIdStack
+        flyOutActiveIdStack,
+        updateParentDescendantStack
     ]);
-    return (_jsxs(StyledMenu, { id: id, role: 'menu', "aria-describedby": !focusControlEl ? `${id}-menuDescription` : undefined, ...restProps, ref: menuRef, children: [!focusControlEl && (_jsx("span", { id: `${id}-menuDescription`, hidden: true, children: (`${t('menu_selection_instructions')} ` && ariaDescribedBy) || '' })), header && _jsx("header", { children: header }), _jsx(StyledMenuListWrapper, { children: _jsx(MenuContext.Provider, { value: contextValue, children: variant === 'drill-down' ? (_jsx(MenuList, { items: items })) : (_jsx(FlyoutMenuList, { items: items })) }) }), footer && _jsx("footer", { children: footer })] }));
+    return (_jsxs(StyledMenu, { id: id, "aria-describedby": !focusControlEl ? `${id}-menuDescription` : undefined, ...restProps, ref: menuRef, children: [!focusControlEl && (_jsx("span", { id: `${id}-menuDescription`, hidden: true, children: (`${t('menu_selection_instructions')} ` && ariaDescribedBy) || '' })), label && _jsx(VisuallyHiddenText, { id: `${id}-menuLabel`, children: label }), header && _jsx("header", { children: header }), _jsx(StyledMenuListWrapper, { children: _jsx(MenuContext.Provider, { value: contextValue, children: variant === 'drill-down' ? (_jsx(MenuList, { items: items, id: listId, menuRole: role, "aria-labelledby": label ? `${id}-menuLabel` : undefined })) : (_jsx(FlyoutMenuList, { items: items, menuRole: role })) }) }), footer && _jsx("footer", { children: footer })] }));
 });
 export default Menu;
 //# sourceMappingURL=Menu.js.map