baseui 10.8.0 → 10.9.0

package/map-marker/drag-shadow.js

@@ -0,0 +1,64 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var React = _interopRequireWildcard(require("react"));
+
+var _overrides = require("../helpers/overrides.js");
+
+var _constants = require("./constants.js");
+
+var _styledComponents = require("./styled-components.js");
+
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+var DragShadow = function DragShadow(_ref) {
+  var background = _ref.background,
+      dragging = _ref.dragging,
+      height = _ref.height,
+      _ref$overrides = _ref.overrides,
+      overrides = _ref$overrides === void 0 ? {} : _ref$overrides;
+
+  var _getOverrides = (0, _overrides.getOverrides)(overrides.DragShadowContainer, _styledComponents.StyledDragShadowContainer),
+      _getOverrides2 = _slicedToArray(_getOverrides, 2),
+      DragShadowContainer = _getOverrides2[0],
+      dragShadowContainerProps = _getOverrides2[1];
+
+  var _getOverrides3 = (0, _overrides.getOverrides)(overrides.DragShadow, _styledComponents.StyledDragShadow),
+      _getOverrides4 = _slicedToArray(_getOverrides3, 2),
+      DragShadow = _getOverrides4[0],
+      dragShadowProps = _getOverrides4[1];
+
+  return /*#__PURE__*/React.createElement(DragShadowContainer, _extends({
+    $width: _constants.dragShadowWidth,
+    $height: height,
+    $dragging: dragging
+  }, dragShadowContainerProps), /*#__PURE__*/React.createElement(DragShadow, _extends({
+    $width: _constants.dragShadowWidth,
+    $background: background
+  }, dragShadowProps)));
+};
+
+var _default = DragShadow;
+exports.default = _default;

package/map-marker/drag-shadow.js.flow

@@ -0,0 +1,52 @@
+/*
+Copyright (c) Uber Technologies, Inc.
+
+This source code is licensed under the MIT license found in the
+LICENSE file in the root directory of this source tree.
+*/
+// @flow
+import * as React from 'react';
+import {getOverrides} from '../helpers/overrides.js';
+import {dragShadowWidth} from './constants.js';
+import {
+  StyledDragShadow,
+  StyledDragShadowContainer,
+} from './styled-components.js';
+import type {DragShadowPropsT} from './types.js';
+
+const DragShadow = ({
+  background,
+  dragging,
+  height,
+  overrides = {},
+}: DragShadowPropsT) => {
+  const [DragShadowContainer, dragShadowContainerProps] = getOverrides(
+    overrides.DragShadowContainer,
+    StyledDragShadowContainer,
+  );
+  const [DragShadow, dragShadowProps] = getOverrides(
+    overrides.DragShadow,
+    StyledDragShadow,
+  );
+
+  return (
+    <DragShadowContainer
+      $width={dragShadowWidth}
+      $height={height}
+      $dragging={dragging}
+      {...dragShadowContainerProps}
+    >
+      <DragShadow
+        $width={dragShadowWidth}
+        $background={background}
+        {...dragShadowProps}
+      />
+    </DragShadowContainer>
+  );
+};
+
+export default DragShadow;
+
+declare var __DEV__: boolean;
+declare var __NODE__: boolean;
+declare var __BROWSER__: boolean;

package/map-marker/fixed-marker.js

@@ -17,6 +17,10 @@ var _constants = require("./constants.js");
 
 var _pinHead = _interopRequireDefault(require("./pin-head.js"));
 
+var _needle = _interopRequireDefault(require("./needle.js"));
+
+var _dragShadow = _interopRequireDefault(require("./drag-shadow.js"));
+
 var _styledComponents = require("./styled-components.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -39,91 +43,88 @@ function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var Needle = function Needle(_ref) {
-  var size = _ref.size,
-      background = _ref.background,
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+function getColors(kind, theme) {
+  if (kind === _constants.KIND.accent) {
+    return {
+      color: theme.colors.contentInversePrimary,
+      backgroundColor: theme.colors.backgroundAccent
+    };
+  }
+
+  if (kind === _constants.KIND.negative) {
+    return {
+      color: theme.colors.contentInversePrimary,
+      backgroundColor: theme.colors.backgroundNegative
+    };
+  }
+
+  return {
+    color: theme.colors.contentInversePrimary,
+    backgroundColor: theme.colors.backgroundInversePrimary
+  };
+}
+
+var FixedMarker = function FixedMarker(_ref) {
+  var _ref$size = _ref.size,
+      size = _ref$size === void 0 ? _constants.PINHEAD_SIZES_SHAPES.medium : _ref$size,
+      _ref$needle = _ref.needle,
+      needle = _ref$needle === void 0 ? _constants.NEEDLE_SIZES.medium : _ref$needle,
+      label = _ref.label,
+      startEnhancer = _ref.startEnhancer,
+      endEnhancer = _ref.endEnhancer,
+      _ref$kind = _ref.kind,
+      kind = _ref$kind === void 0 ? _constants.KIND.default : _ref$kind,
+      _ref$dragging = _ref.dragging,
+      dragging = _ref$dragging === void 0 ? false : _ref$dragging,
       _ref$overrides = _ref.overrides,
-      overrides = _ref$overrides === void 0 ? {} : _ref$overrides;
-
-  var _getOverrides = (0, _overrides.getOverrides)(overrides.Needle, _styledComponents.Needle),
-      _getOverrides2 = _slicedToArray(_getOverrides, 2),
-      Needle = _getOverrides2[0],
-      needleProps = _getOverrides2[1];
-
-  return /*#__PURE__*/React.createElement(Needle, _extends({
-    $background: background,
-    $height: _constants.NEEDLE_HEIGHTS[size]
-  }, needleProps));
-};
-
-var DragShadow = function DragShadow(_ref2) {
-  var background = _ref2.background,
-      dragging = _ref2.dragging,
-      height = _ref2.height,
-      _ref2$overrides = _ref2.overrides,
-      overrides = _ref2$overrides === void 0 ? {} : _ref2$overrides;
-
-  var _getOverrides3 = (0, _overrides.getOverrides)(overrides.DragShadowContainer, _styledComponents.DragShadowContainer),
-      _getOverrides4 = _slicedToArray(_getOverrides3, 2),
-      DragShadowContainer = _getOverrides4[0],
-      dragShadowContainerProps = _getOverrides4[1];
-
-  var _getOverrides5 = (0, _overrides.getOverrides)(overrides.DragShadow, _styledComponents.DragShadow),
-      _getOverrides6 = _slicedToArray(_getOverrides5, 2),
-      DragShadow = _getOverrides6[0],
-      dragShadowProps = _getOverrides6[1];
-
-  return /*#__PURE__*/React.createElement(DragShadowContainer, _extends({
-    $width: _constants.dragShadowWidth,
-    $height: height,
-    $dragging: dragging
-  }, dragShadowContainerProps), /*#__PURE__*/React.createElement(DragShadow, _extends({
-    $width: _constants.dragShadowWidth,
-    $background: background
-  }, dragShadowProps)));
-};
-
-var FixedMarker = function FixedMarker(_ref3) {
-  var _ref3$size = _ref3.size,
-      size = _ref3$size === void 0 ? _constants.PINHEAD_SIZES_SHAPES.medium : _ref3$size,
-      _ref3$needle = _ref3.needle,
-      needle = _ref3$needle === void 0 ? _constants.NEEDLE_SIZES.medium : _ref3$needle,
-      label = _ref3.label,
-      startEnhancer = _ref3.startEnhancer,
-      endEnhancer = _ref3.endEnhancer,
-      color = _ref3.color,
-      background = _ref3.background,
-      _ref3$dragging = _ref3.dragging,
-      dragging = _ref3$dragging === void 0 ? false : _ref3$dragging,
-      _ref3$overrides = _ref3.overrides,
-      overrides = _ref3$overrides === void 0 ? {} : _ref3$overrides;
+      overrides = _ref$overrides === void 0 ? {} : _ref$overrides,
+      _ref$labelEnhancerCon = _ref.labelEnhancerContent,
+      labelEnhancerContent = _ref$labelEnhancerCon === void 0 ? null : _ref$labelEnhancerCon,
+      _ref$labelEnhancerPos = _ref.labelEnhancerPosition,
+      labelEnhancerPosition = _ref$labelEnhancerPos === void 0 ? _constants.LABEL_ENHANCER_POSITIONS.bottom : _ref$labelEnhancerPos,
+      _ref$badgeEnhancerSiz = _ref.badgeEnhancerSize,
+      badgeEnhancerSize = _ref$badgeEnhancerSiz === void 0 ? null : _ref$badgeEnhancerSiz,
+      _ref$badgeEnhancerCon = _ref.badgeEnhancerContent,
+      badgeEnhancerContent = _ref$badgeEnhancerCon === void 0 ? null : _ref$badgeEnhancerCon,
+      restProps = _objectWithoutProperties(_ref, ["size", "needle", "label", "startEnhancer", "endEnhancer", "kind", "dragging", "overrides", "labelEnhancerContent", "labelEnhancerPosition", "badgeEnhancerSize", "badgeEnhancerContent"]);
 
   var _useStyletron = (0, _index.useStyletron)(),
       _useStyletron2 = _slicedToArray(_useStyletron, 2),
       theme = _useStyletron2[1];
 
-  var _theme$colors = theme.colors,
-      backgroundInversePrimary = _theme$colors.backgroundInversePrimary,
-      primaryB = _theme$colors.primaryB;
-  color = color || primaryB;
-  background = background || backgroundInversePrimary;
-  var doesPinHeadTransformOnDrag = needle !== _constants.NEEDLE_SIZES.none;
+  var _getColors = getColors(kind, theme),
+      color = _getColors.color,
+      backgroundColor = _getColors.backgroundColor;
+
+  var doesPinHeadTransformOnDrag = needle !== _constants.NEEDLE_SIZES.none && size !== _constants.PINHEAD_SIZES_SHAPES.xxSmallCircle && size !== _constants.PINHEAD_SIZES_SHAPES.xxSmallSquare;
+
+  var _getOverrides = (0, _overrides.getOverrides)(overrides.Root, _styledComponents.StyledFixedMarkerRoot),
+      _getOverrides2 = _slicedToArray(_getOverrides, 2),
+      Root = _getOverrides2[0],
+      rootProps = _getOverrides2[1];
+
+  var _getOverrides3 = (0, _overrides.getOverrides)(overrides.DragContainer, _styledComponents.StyledFixedMarkerDragContainer),
+      _getOverrides4 = _slicedToArray(_getOverrides3, 2),
+      FixedMarkerDragContainer = _getOverrides4[0],
+      fixedMarkerDragContainerProps = _getOverrides4[1];
 
-  var _getOverrides7 = (0, _overrides.getOverrides)(overrides.Root, _styledComponents.FixedMarkerRoot),
-      _getOverrides8 = _slicedToArray(_getOverrides7, 2),
-      Root = _getOverrides8[0],
-      rootProps = _getOverrides8[1];
+  var renderNeedle = needle !== _constants.NEEDLE_SIZES.none && ![_constants.PINHEAD_SIZES_SHAPES.xxSmallCircle, _constants.PINHEAD_SIZES_SHAPES.xxSmallSquare].includes(size);
 
-  var _getOverrides9 = (0, _overrides.getOverrides)(overrides.DragContainer, _styledComponents.FixedMarkerDragContainer),
-      _getOverrides10 = _slicedToArray(_getOverrides9, 2),
-      FixedMarkerDragContainer = _getOverrides10[0],
-      fixedMarkerDragContainerProps = _getOverrides10[1];
+  if (process.env.NODE_ENV !== "production") {
+    if (needle !== _constants.NEEDLE_SIZES.none && [_constants.PINHEAD_SIZES_SHAPES.xxSmallCircle, _constants.PINHEAD_SIZES_SHAPES.xxSmallSquare].includes(size)) {
+      console.warn("Needles cannot be rendered with ".concat(_constants.PINHEAD_SIZES_SHAPES.xxSmallCircle, " or ").concat(_constants.PINHEAD_SIZES_SHAPES.xxSmallSquare, " pin heads"));
+    }
+  }
 
   return /*#__PURE__*/React.createElement(Root, _extends({
     "data-baseweb": "fixed-map-marker"
   }, rootProps), /*#__PURE__*/React.createElement(FixedMarkerDragContainer, _extends({
     $translateAmount: _constants.dragShadowMarginTop + _constants.dragShadowHeight,
-    $performTranslate: doesPinHeadTransformOnDrag && dragging
+    $performTranslate: doesPinHeadTransformOnDrag && !dragging
   }, fixedMarkerDragContainerProps), /*#__PURE__*/React.createElement(_pinHead.default, _extends({
     size: size,
     label: label
@@ -133,15 +134,20 @@ var FixedMarker = function FixedMarker(_ref3) {
     endEnhancer: endEnhancer
   } : {}, {
     color: color,
-    background: background,
+    background: backgroundColor,
     type: _constants.PINHEAD_TYPES.fixed,
-    overrides: overrides
-  })), /*#__PURE__*/React.createElement(Needle, {
+    overrides: overrides,
+    badgeEnhancerSize: badgeEnhancerSize,
+    badgeEnhancerContent: badgeEnhancerContent,
+    labelEnhancerContent: labelEnhancerContent,
+    labelEnhancerPosition: labelEnhancerPosition,
+    needle: needle
+  })), renderNeedle && /*#__PURE__*/React.createElement(_needle.default, {
     size: needle,
-    background: background,
+    background: backgroundColor,
     overrides: overrides
-  })), doesPinHeadTransformOnDrag && /*#__PURE__*/React.createElement(DragShadow, {
-    background: background,
+  })), doesPinHeadTransformOnDrag && /*#__PURE__*/React.createElement(_dragShadow.default, {
+    background: backgroundColor,
     dragging: dragging,
     height: _constants.dragShadowMarginTop + _constants.dragShadowHeight,
     overrides: overrides

package/map-marker/fixed-marker.js.flow

@@ -6,72 +6,49 @@ LICENSE file in the root directory of this source tree.
 */
 // @flow
 import * as React from 'react';
-import {useStyletron} from '../styles/index.js';
+import {useStyletron, type ThemeT} from '../styles/index.js';
 import {getOverrides} from '../helpers/overrides.js';
 import {
   PINHEAD_TYPES,
   NEEDLE_SIZES,
-  NEEDLE_HEIGHTS,
   PINHEAD_SIZES_SHAPES,
+  LABEL_ENHANCER_POSITIONS,
+  KIND,
   dragShadowHeight,
   dragShadowMarginTop,
-  dragShadowWidth,
 } from './constants.js';
 import PinHead from './pin-head.js';
+import Needle from './needle.js';
+import DragShadow from './drag-shadow.js';
 import {
-  FixedMarkerDragContainer as StyledFixedMarkerDragContainer,
-  FixedMarkerRoot as StyledRoot,
-  Needle as StyledNeedle,
-  DragShadow as StyledDragShadow,
-  DragShadowContainer as StyledDragShadowContainer,
+  StyledFixedMarkerDragContainer,
+  StyledFixedMarkerRoot,
 } from './styled-components.js';
-import type {
-  FixedMarkerPropsT,
-  NeedlePropsT,
-  DragShadowPropsT,
-} from './types.js';
+import type {FixedMarkerPropsT, KindT} from './types.js';
 
-const Needle = ({size, background, overrides = {}}: NeedlePropsT) => {
-  const [Needle, needleProps] = getOverrides(overrides.Needle, StyledNeedle);
-  return (
-    <Needle
-      $background={background}
-      $height={NEEDLE_HEIGHTS[size]}
-      {...needleProps}
-    />
-  );
+type Colors = {
+  color: string,
+  backgroundColor: string,
 };
 
-const DragShadow = ({
-  background,
-  dragging,
-  height,
-  overrides = {},
-}: DragShadowPropsT) => {
-  const [DragShadowContainer, dragShadowContainerProps] = getOverrides(
-    overrides.DragShadowContainer,
-    StyledDragShadowContainer,
-  );
-  const [DragShadow, dragShadowProps] = getOverrides(
-    overrides.DragShadow,
-    StyledDragShadow,
-  );
-
-  return (
-    <DragShadowContainer
-      $width={dragShadowWidth}
-      $height={height}
-      $dragging={dragging}
-      {...dragShadowContainerProps}
-    >
-      <DragShadow
-        $width={dragShadowWidth}
-        $background={background}
-        {...dragShadowProps}
-      />
-    </DragShadowContainer>
-  );
-};
+function getColors(kind: KindT, theme: ThemeT): Colors {
+  if (kind === KIND.accent) {
+    return {
+      color: theme.colors.contentInversePrimary,
+      backgroundColor: theme.colors.backgroundAccent,
+    };
+  }
+  if (kind === KIND.negative) {
+    return {
+      color: theme.colors.contentInversePrimary,
+      backgroundColor: theme.colors.backgroundNegative,
+    };
+  }
+  return {
+    color: theme.colors.contentInversePrimary,
+    backgroundColor: theme.colors.backgroundInversePrimary,
+  };
+}
 
 const FixedMarker = ({
   size = PINHEAD_SIZES_SHAPES.medium,
@@ -79,31 +56,55 @@ const FixedMarker = ({
   label,
   startEnhancer,
   endEnhancer,
-  color,
-  background,
+  kind = KIND.default,
   dragging = false,
   overrides = {},
+  labelEnhancerContent = null,
+  labelEnhancerPosition = LABEL_ENHANCER_POSITIONS.bottom,
+  badgeEnhancerSize = null,
+  badgeEnhancerContent = null,
+  ...restProps
 }: FixedMarkerPropsT) => {
   const [, theme] = useStyletron();
-  const {
-    colors: {backgroundInversePrimary, primaryB},
-  } = theme;
-
-  color = color || primaryB;
-  background = background || backgroundInversePrimary;
+  const {color, backgroundColor} = getColors(kind, theme);
 
-  const doesPinHeadTransformOnDrag = needle !== NEEDLE_SIZES.none;
+  const doesPinHeadTransformOnDrag =
+    needle !== NEEDLE_SIZES.none &&
+    size !== PINHEAD_SIZES_SHAPES.xxSmallCircle &&
+    size !== PINHEAD_SIZES_SHAPES.xxSmallSquare;
 
-  const [Root, rootProps] = getOverrides(overrides.Root, StyledRoot);
+  const [Root, rootProps] = getOverrides(overrides.Root, StyledFixedMarkerRoot);
   const [
     FixedMarkerDragContainer,
     fixedMarkerDragContainerProps,
   ] = getOverrides(overrides.DragContainer, StyledFixedMarkerDragContainer);
+
+  const renderNeedle =
+    needle !== NEEDLE_SIZES.none &&
+    ![
+      PINHEAD_SIZES_SHAPES.xxSmallCircle,
+      PINHEAD_SIZES_SHAPES.xxSmallSquare,
+    ].includes(size);
+
+  if (__DEV__) {
+    if (
+      needle !== NEEDLE_SIZES.none &&
+      [
+        PINHEAD_SIZES_SHAPES.xxSmallCircle,
+        PINHEAD_SIZES_SHAPES.xxSmallSquare,
+      ].includes(size)
+    ) {
+      console.warn(
+        `Needles cannot be rendered with ${PINHEAD_SIZES_SHAPES.xxSmallCircle} or ${PINHEAD_SIZES_SHAPES.xxSmallSquare} pin heads`,
+      );
+    }
+  }
+
   return (
     <Root data-baseweb="fixed-map-marker" {...rootProps}>
       <FixedMarkerDragContainer
         $translateAmount={dragShadowMarginTop + dragShadowHeight}
-        $performTranslate={doesPinHeadTransformOnDrag && dragging}
+        $performTranslate={doesPinHeadTransformOnDrag && !dragging}
         {...fixedMarkerDragContainerProps}
       >
         <PinHead
@@ -112,15 +113,26 @@ const FixedMarker = ({
           {...(startEnhancer ? {startEnhancer} : {})}
           {...(endEnhancer ? {endEnhancer} : {})}
           color={color}
-          background={background}
+          background={backgroundColor}
           type={PINHEAD_TYPES.fixed}
           overrides={overrides}
+          badgeEnhancerSize={badgeEnhancerSize}
+          badgeEnhancerContent={badgeEnhancerContent}
+          labelEnhancerContent={labelEnhancerContent}
+          labelEnhancerPosition={labelEnhancerPosition}
+          needle={needle}
         />
-        <Needle size={needle} background={background} overrides={overrides} />
+        {renderNeedle && (
+          <Needle
+            size={needle}
+            background={backgroundColor}
+            overrides={overrides}
+          />
+        )}
       </FixedMarkerDragContainer>
       {doesPinHeadTransformOnDrag && (
         <DragShadow
-          background={background}
+          background={backgroundColor}
           dragging={dragging}
           height={dragShadowMarginTop + dragShadowHeight}
           overrides={overrides}

package/map-marker/floating-marker.js

@@ -39,10 +39,20 @@ function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+function getAnchorPinHeadSize(anchorType) {
+  if (anchorType === _constants.FLOATING_MARKER_ANCHOR_TYPES.circle) {
+    return _constants.PINHEAD_SIZES_SHAPES.xSmallCircle;
+  } else if (anchorType === _constants.FLOATING_MARKER_ANCHOR_TYPES.square) {
+    return _constants.PINHEAD_SIZES_SHAPES.xSmallSquare;
+  } else if (anchorType === _constants.FLOATING_MARKER_ANCHOR_TYPES.xxSmallSquare) {
+    return _constants.PINHEAD_SIZES_SHAPES.xxSmallSquare;
+  } else {
+    return _constants.PINHEAD_SIZES_SHAPES.xxSmallCircle;
+  }
+}
+
 var FloatingMarker = function FloatingMarker(_ref) {
-  var color = _ref.color,
-      background = _ref.background,
-      label = _ref.label,
+  var label = _ref.label,
       _ref$size = _ref.size,
       size = _ref$size === void 0 ? _constants.PINHEAD_SIZES_SHAPES.medium : _ref$size,
       _ref$anchor = _ref.anchor,
@@ -63,34 +73,33 @@ var FloatingMarker = function FloatingMarker(_ref) {
       backgroundInversePrimary = _theme$colors.backgroundInversePrimary,
       primaryA = _theme$colors.primaryA,
       primaryB = _theme$colors.primaryB;
-  color = color || primaryA;
-  background = background || backgroundPrimary;
-  var anchorPinHeadSize = anchorType === _constants.FLOATING_MARKER_ANCHOR_TYPES.circle ? _constants.PINHEAD_SIZES_SHAPES.xSmallCircle : _constants.PINHEAD_SIZES_SHAPES.xSmallSquare;
+  var anchorPinHeadSize = getAnchorPinHeadSize(anchorType);
 
-  var _getOverrides = (0, _overrides.getOverrides)(overrides.Root, _styledComponents.FloatingMarkerRoot),
+  var _getOverrides = (0, _overrides.getOverrides)(overrides.Root, _styledComponents.StyledFloatingMarkerRoot),
       _getOverrides2 = _slicedToArray(_getOverrides, 2),
       Root = _getOverrides2[0],
       rootProps = _getOverrides2[1];
 
-  var _getOverrides3 = (0, _overrides.getOverrides)(overrides.PinHeadContainer, _styledComponents.FloatingMarkerPinHeadContainer),
+  var _getOverrides3 = (0, _overrides.getOverrides)(overrides.PinHeadContainer, _styledComponents.StyledFloatingMarkerPinHeadContainer),
       _getOverrides4 = _slicedToArray(_getOverrides3, 2),
       FloatingMarkerPinHeadContainer = _getOverrides4[0],
       floatingMarkerPinHeadContainerProps = _getOverrides4[1];
 
-  var _getOverrides5 = (0, _overrides.getOverrides)(overrides.AnchorContainer, _styledComponents.FloatingMarkerAnchorContainer),
+  var _getOverrides5 = (0, _overrides.getOverrides)(overrides.AnchorContainer, _styledComponents.StyledFloatingMarkerAnchorContainer),
       _getOverrides6 = _slicedToArray(_getOverrides5, 2),
       FloatingMarkerAnchorContainer = _getOverrides6[0],
       floatingMarkerAnchorContainerProps = _getOverrides6[1];
 
   return /*#__PURE__*/React.createElement(Root, _extends({
-    "data-baseweb": "floating-map-marker"
+    "data-baseweb": "floating-map-marker",
+    $size: _constants.PINHEAD_DIMENSIONS[anchorPinHeadSize].height
   }, rootProps), /*#__PURE__*/React.createElement(FloatingMarkerPinHeadContainer, _extends({
     $anchor: anchor,
-    $anchorSize: _constants.anchorSize
+    $anchorSize: _constants.PINHEAD_DIMENSIONS[anchorPinHeadSize].height
   }, floatingMarkerPinHeadContainerProps), /*#__PURE__*/React.createElement(_pinHead.default, {
     size: size,
-    color: color,
-    background: background,
+    color: primaryA,
+    background: backgroundPrimary,
     type: _constants.PINHEAD_TYPES.floating,
     label: label,
     startEnhancer: startEnhancer,

package/map-marker/floating-marker.js.flow

@@ -10,9 +10,9 @@ import {useStyletron} from '../styles/index.js';
 import PinHead from './pin-head.js';
 import {getOverrides} from '../helpers/overrides.js';
 import {
-  FloatingMarkerRoot as StyledRoot,
-  FloatingMarkerAnchorContainer as StyledFloatingMarkerAnchorContainer,
-  FloatingMarkerPinHeadContainer as StyledFloatingMarkerPinHeadContainer,
+  StyledFloatingMarkerRoot,
+  StyledFloatingMarkerAnchorContainer,
+  StyledFloatingMarkerPinHeadContainer,
 } from './styled-components.js';
 import type {FloatingMarkerPropsT} from './types.js';
 import {
@@ -20,12 +20,22 @@ import {
   PINHEAD_SIZES_SHAPES,
   PINHEAD_TYPES,
   FLOATING_MARKER_ANCHOR_TYPES,
-  anchorSize,
+  PINHEAD_DIMENSIONS,
 } from './constants.js';
 
+function getAnchorPinHeadSize(anchorType) {
+  if (anchorType === FLOATING_MARKER_ANCHOR_TYPES.circle) {
+    return PINHEAD_SIZES_SHAPES.xSmallCircle;
+  } else if (anchorType === FLOATING_MARKER_ANCHOR_TYPES.square) {
+    return PINHEAD_SIZES_SHAPES.xSmallSquare;
+  } else if (anchorType === FLOATING_MARKER_ANCHOR_TYPES.xxSmallSquare) {
+    return PINHEAD_SIZES_SHAPES.xxSmallSquare;
+  } else {
+    return PINHEAD_SIZES_SHAPES.xxSmallCircle;
+  }
+}
+
 const FloatingMarker = ({
-  color,
-  background,
   label,
   size = PINHEAD_SIZES_SHAPES.medium,
   anchor = FLOATING_MARKER_ANCHOR_POSITIONS.bottomLeft,
@@ -38,15 +48,13 @@ const FloatingMarker = ({
   const {
     colors: {backgroundPrimary, backgroundInversePrimary, primaryA, primaryB},
   } = theme;
-  color = color || primaryA;
-  background = background || backgroundPrimary;
 
-  const anchorPinHeadSize =
-    anchorType === FLOATING_MARKER_ANCHOR_TYPES.circle
-      ? PINHEAD_SIZES_SHAPES.xSmallCircle
-      : PINHEAD_SIZES_SHAPES.xSmallSquare;
+  const anchorPinHeadSize = getAnchorPinHeadSize(anchorType);
 
-  const [Root, rootProps] = getOverrides(overrides.Root, StyledRoot);
+  const [Root, rootProps] = getOverrides(
+    overrides.Root,
+    StyledFloatingMarkerRoot,
+  );
   const [
     FloatingMarkerPinHeadContainer,
     floatingMarkerPinHeadContainerProps,
@@ -62,17 +70,22 @@ const FloatingMarker = ({
     overrides.AnchorContainer,
     StyledFloatingMarkerAnchorContainer,
   );
+
   return (
-    <Root data-baseweb="floating-map-marker" {...rootProps}>
+    <Root
+      data-baseweb="floating-map-marker"
+      $size={PINHEAD_DIMENSIONS[anchorPinHeadSize].height}
+      {...rootProps}
+    >
       <FloatingMarkerPinHeadContainer
         $anchor={anchor}
-        $anchorSize={anchorSize}
+        $anchorSize={PINHEAD_DIMENSIONS[anchorPinHeadSize].height}
         {...floatingMarkerPinHeadContainerProps}
       >
         <PinHead
           size={size}
-          color={color}
-          background={background}
+          color={primaryA}
+          background={backgroundPrimary}
           type={PINHEAD_TYPES.floating}
           label={label}
           startEnhancer={startEnhancer}