@skyscanner/backpack-web 37.11.0 → 38.0.1

package/bpk-component-map/index.js

@@ -17,10 +17,9 @@
  */import BpkIconMarker from "./src/BpkIconMarker";
 import BpkMap from "./src/BpkMap";
 import BpkOverlayView from "./src/BpkOverlayView";
-import BpkPriceMarker, { PRICE_MARKER_STATUSES } from "./src/BpkPriceMarker";
-import { BpkPriceMarkerV2 } from "./src/BpkPriceMarkerV2/BpkPriceMarker";
-import BpkPriceMarkerButton, { MARKER_STATUSES } from "./src/BpkPriceMarkerV2/BpkPriceMarkerButton";
+import BpkPriceMarker from "./src/BpkPriceMarker";
+import BpkPriceMarkerButton, { MARKER_STATUSES } from "./src/BpkPriceMarkerButton";
 import { defaultIconMarkerThemeAttributes, priceMarkerThemeAttributes } from "./src/themeAttributes";
 import withGoogleMapsScript from "./src/withGoogleMapsScript";
 export default BpkMap;
-export { BpkIconMarker, BpkPriceMarker, BpkPriceMarkerV2, BpkOverlayView, withGoogleMapsScript, defaultIconMarkerThemeAttributes, priceMarkerThemeAttributes, PRICE_MARKER_STATUSES, MARKER_STATUSES, BpkPriceMarkerButton };
+export { BpkIconMarker, BpkPriceMarker, BpkOverlayView, withGoogleMapsScript, defaultIconMarkerThemeAttributes, priceMarkerThemeAttributes, MARKER_STATUSES, BpkPriceMarkerButton };

package/bpk-component-map/src/{BpkPriceMarkerV2/BpkPriceMarker.d.ts → BpkPriceMarker.d.ts}

@@ -6,5 +6,5 @@ type Props = {
         longitude: number;
     };
 } & BpkPriceMarkerButtonProps;
-export declare const BpkPriceMarkerV2: (props: Props) => import("react/jsx-runtime").JSX.Element;
-export {};
+declare const BpkPriceMarker: (props: Props) => import("react/jsx-runtime").JSX.Element;
+export default BpkPriceMarker;

package/bpk-component-map/src/BpkPriceMarker.js

@@ -14,75 +14,38 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */import PropTypes from 'prop-types';
-import BpkText, { TEXT_STYLES } from "../../bpk-component-text/src/BpkText";
-import { cssModules } from "../../bpk-react-utils";
+ */
+
 import BpkBasicMapMarker from "./BpkBasicMapMarker";
-import { LatLongPropType } from "./common-types";
-import STYLES from "./BpkPriceMarker.module.css";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const getClassName = cssModules(STYLES);
-export const PRICE_MARKER_STATUSES = {
-  default: 'default',
-  focused: 'focused',
-  viewed: 'viewed'
-};
+import BpkPriceMarkerButton, { MARKER_STATUSES } from "./BpkPriceMarkerButton";
+import { jsx as _jsx } from "react/jsx-runtime";
 const BpkPriceMarker = props => {
   const {
-    arrowClassName,
+    accessibilityLabel,
     buttonProps,
     className,
-    disabled,
+    icon,
     label,
     onClick,
     position,
-    status,
+    status = MARKER_STATUSES.unselected,
     ...rest
   } = props;
-  const markerWrapperClassNames = getClassName('bpk-price-marker__wrapper');
-  const classNames = getClassName('bpk-price-marker', `bpk-price-marker-${status}`, onClick && 'bpk-price-marker--dynamic', className, disabled && `bpk-price-marker-disabled`);
-  const arrowClassNames = getClassName('bpk-price-marker__arrow', `bpk-price-marker__arrow-${status}`, arrowClassName, disabled && `bpk-price-marker__arrow-disabled`);
-  return (
-    /*#__PURE__*/
-    // $FlowFixMe[cannot-spread-inexact] - inexact rest. See 'decisions/flowfixme.md'.
-    _jsx(BpkBasicMapMarker, {
-      position: position,
-      ...rest,
-      children: /*#__PURE__*/_jsxs("button", {
-        type: "button",
-        className: markerWrapperClassNames,
-        onClick: onClick,
-        disabled: disabled,
-        ...buttonProps,
-        children: [/*#__PURE__*/_jsx("span", {
-          className: classNames,
-          children: /*#__PURE__*/_jsx(BpkText, {
-            textStyle: status === PRICE_MARKER_STATUSES.focused ? TEXT_STYLES.label1 : TEXT_STYLES.label2,
-            children: label
-          })
-        }), /*#__PURE__*/_jsx("div", {
-          className: arrowClassNames
-        })]
-      })
+  const allButtonProps = {
+    className,
+    icon,
+    label,
+    onClick,
+    status,
+    buttonProps
+  };
+  return /*#__PURE__*/_jsx(BpkBasicMapMarker, {
+    position: position,
+    "aria-label": accessibilityLabel,
+    ...rest,
+    children: /*#__PURE__*/_jsx(BpkPriceMarkerButton, {
+      ...allButtonProps
     })
-  );
-};
-BpkPriceMarker.propTypes = {
-  label: PropTypes.string.isRequired,
-  position: LatLongPropType.isRequired,
-  arrowClassName: PropTypes.string,
-  className: PropTypes.string,
-  onClick: PropTypes.func,
-  disabled: PropTypes.bool,
-  status: PropTypes.oneOf(Object.keys(PRICE_MARKER_STATUSES)),
-  buttonProps: PropTypes.object // eslint-disable-line react/forbid-prop-types
-};
-BpkPriceMarker.defaultProps = {
-  className: null,
-  arrowClassName: null,
-  onClick: null,
-  disabled: false,
-  status: PRICE_MARKER_STATUSES.default,
-  buttonProps: null
+  });
 };
 export default BpkPriceMarker;

package/bpk-component-map/src/{BpkPriceMarkerV2/BpkPriceMarkerButton.js → BpkPriceMarkerButton.js}

@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import BpkText, { TEXT_STYLES } from "../../../bpk-component-text";
-import { cssModules } from "../../../bpk-react-utils";
+import BpkText, { TEXT_STYLES } from "../../bpk-component-text";
+import { cssModules } from "../../bpk-react-utils";
 import STYLES from "./BpkPriceMarkerButton.module.css";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const getClassName = cssModules(STYLES);

package/bpk-component-rating/src/BpkRating.d.ts

@@ -4,9 +4,9 @@ type ValueOf<T> = T[keyof T];
 type Props = {
     ariaLabel: string;
     className?: string;
-    ratingScale: ValueOf<typeof RATING_SCALES>;
+    ratingScale?: ValueOf<typeof RATING_SCALES>;
     showScale?: boolean;
-    size: ValueOf<typeof RATING_SIZES>;
+    size?: ValueOf<typeof RATING_SIZES>;
     subtitle?: string;
     title?: string | ReactNode;
     value: string | number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyscanner/backpack-web",
-  "version": "37.11.0",
+  "version": "38.0.1",
   "description": "Backpack Design System web library",
   "repository": {
     "type": "git",

package/bpk-component-map/src/BpkPriceMarker.module.css

@@ -1,18 +0,0 @@
-/*
- * Backpack - Skyscanner's Design System
- * 
- * Copyright 2016 Skyscanner Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-.bpk-price-marker{display:flex;padding:.125rem .5rem;justify-content:center;align-items:center;border:3px solid;border-radius:.5rem}.bpk-price-marker--dynamic{cursor:pointer}.bpk-price-marker-default{color:#fff;border-color:#0062e3;border-color:var(--bpk-price-marker-background-color, rgb(0, 98, 227));background-color:#0062e3;background-color:var(--bpk-price-marker-background-color, rgb(0, 98, 227))}.bpk-price-marker-viewed{color:hsla(0,0%,100%,.8);color:var(--bpk-price-marker-viewed-color, rgba(255, 255, 255, 0.8));border-color:#0062e3;border-color:var(--bpk-price-marker-viewed-border-color, rgb(0, 98, 227));background-color:#0062e3;background-color:var(--bpk-price-marker-viewed-background-color, rgb(0, 98, 227))}.bpk-price-marker-focused{padding:.375rem .5rem;background-color:#fff;border-color:#0062e3;border-color:var(--bpk-price-marker-selected-border-color, rgb(0, 98, 227));color:#0062e3;color:var(--bpk-price-marker-selected-color, rgb(0, 98, 227))}.bpk-price-marker-disabled{z-index:-2;border-color:#fff;background-color:#fff;color:rgba(0,0,0,.2)}.bpk-price-marker__wrapper{position:relative;display:flex;padding:0;flex-direction:column;align-items:center;transform:translate(calc(-50% - 3px), calc(-100% - 3px - 1rem / 2));border:none;background:none}.bpk-price-marker__arrow{position:absolute;top:50%;z-index:-1;width:1rem;height:1rem;transform:rotate(45deg);border-radius:25%;background-color:#0062e3}.bpk-price-marker__arrow-default{background-color:#0062e3;background-color:var(--bpk-price-marker-background-color, rgb(0, 98, 227))}.bpk-price-marker__arrow-viewed{background-color:#0062e3;background-color:var(--bpk-price-marker-viewed-border-color, rgb(0, 98, 227))}.bpk-price-marker__arrow-focused{top:75%;background-color:#0062e3;background-color:var(--bpk-price-marker-selected-border-color, rgb(0, 98, 227))}.bpk-price-marker__arrow-disabled{top:75%;z-index:-3;background-color:#fff}

package/bpk-component-map/src/BpkPriceMarkerV2/BpkPriceMarker.js

@@ -1,51 +0,0 @@
-/*
- * Backpack - Skyscanner's Design System
- *
- * Copyright 2016 Skyscanner Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import BpkBasicMapMarker from "../BpkBasicMapMarker";
-import BpkPriceMarkerButton, { MARKER_STATUSES } from "./BpkPriceMarkerButton";
-import { jsx as _jsx } from "react/jsx-runtime";
-// eslint-disable-next-line import/prefer-default-export
-export const BpkPriceMarkerV2 = props => {
-  const {
-    accessibilityLabel,
-    buttonProps,
-    className,
-    icon,
-    label,
-    onClick,
-    position,
-    status = MARKER_STATUSES.unselected,
-    ...rest
-  } = props;
-  const allButtonProps = {
-    className,
-    icon,
-    label,
-    onClick,
-    status,
-    buttonProps
-  };
-  return /*#__PURE__*/_jsx(BpkBasicMapMarker, {
-    position: position,
-    "aria-label": accessibilityLabel,
-    ...rest,
-    children: /*#__PURE__*/_jsx(BpkPriceMarkerButton, {
-      ...allButtonProps
-    })
-  });
-};