@dhis2/analytics 26.2.0 → 26.3.0-alpha.2

package/build/cjs/components/DimensionsPanel/List/styles/RecommendedIcon.style.js

@@ -7,11 +7,11 @@ exports.styles = void 0;
 var _ui = require("@dhis2/ui");
 const styles = {
   recommendedIcon: {
-    backgroundColor: _ui.theme.secondary300,
-    height: '8px',
-    width: '8px',
+    backgroundColor: _ui.theme.secondary400,
+    height: '6px',
+    width: '6px',
     borderRadius: '4px',
-    marginLeft: '5px',
+    marginLeft: '6px',
     display: 'inline-block',
     cursor: 'pointer'
   }

package/build/cjs/components/DimensionsPanel/styles/DimensionsPanel.style.js

@@ -10,7 +10,7 @@ const styles = {
     height: '100%',
     display: 'flex',
     flexDirection: 'column',
-    backgroundColor: _ui.colors.grey050,
+    backgroundColor: _ui.colors.white,
     padding: '8px',
     overflow: 'hidden'
   },

package/build/es/__demo__/DimensionsPanel.stories.js

@@ -62,6 +62,7 @@ storiesOf('DimensionsPanel', module).add('locked dimension', () => {
   return /*#__PURE__*/React.createElement(DimensionsPanel, {
     dimensions: [...fixedDimensions, ...dynamicDimensions],
     onDimensionClick: onDimensionClick,
+    selectedIds: [DIMENSION_ID_DATA],
     lockedDimension: dimension => dimension === DIMENSION_ID_DATA
   });
 });

package/build/es/assets/DynamicDimensionIcon.js

@@ -1,47 +1,21 @@
 import React from 'react';
 const DynamicDimensionIcon = () => {
   return /*#__PURE__*/React.createElement("svg", {
-    width: "16px",
-    height: "16px",
-    viewBox: "0 0 16 16",
-    version: "1.1",
-    xmlns: "http://www.w3.org/2000/svg"
-  }, /*#__PURE__*/React.createElement("g", {
-    id: "Exp",
-    stroke: "none",
-    strokeWidth: "1",
-    fill: "none",
-    fillRule: "evenodd"
-  }, /*#__PURE__*/React.createElement("g", {
-    id: "Artboard",
-    transform: "translate(-80.000000, -9.000000)"
-  }, /*#__PURE__*/React.createElement("g", {
-    id: "icon_dimension_new",
-    transform: "translate(80.000000, 9.000000)"
-  }, /*#__PURE__*/React.createElement("rect", {
-    id: "frame",
-    x: "0",
-    y: "0",
     width: "16",
-    height: "16"
-  }), /*#__PURE__*/React.createElement("g", {
-    id: "module",
-    transform: "translate(4.000000, 4.000000)",
-    stroke: "#000000",
+    height: "16",
+    fill: "none",
+    xmlns: "http://www.w3.org/2000/svg"
+  }, /*#__PURE__*/React.createElement("path", {
+    clipRule: "evenodd",
+    d: "m4.832 5.674 2.831-1.11a.913.913 0 0 1 .673 0l2.83 1.11a.548.548 0 0 1 .334.517V9.81a.548.548 0 0 1-.332.517l-2.831 1.11a.92.92 0 0 1-.673 0l-2.83-1.11a.548.548 0 0 1-.334-.517V6.19a.548.548 0 0 1 .332-.517Z",
+    stroke: "#212934",
     strokeLinecap: "round",
     strokeLinejoin: "round"
-  }, /*#__PURE__*/React.createElement("path", {
-    d: "M0.33209728,1.1742111 L3.16308174,0.0641666694 C3.37911767,-0.0213888898 3.61963794,-0.0213888898 3.83567387,0.0641666694 L6.66665833,1.1742111 C6.87300668,1.26220739 7.00497003,1.467 6.99984343,1.69127776 L6.99984343,5.30887771 C7.00517859,5.53285411 6.87376309,5.73756106 6.66790272,5.82594437 L3.83691826,6.93629991 C3.62076407,7.02123336 3.38048032,7.02123336 3.16432613,6.93629991 L0.333341668,5.82594437 C0.126993317,5.73794808 -0.00497002591,5.53315547 0.000156574133,5.30887771 L0.000156574133,1.69127776 C-0.00517858533,1.46730136 0.126236906,1.26259441 0.33209728,1.1742111 Z",
-    id: "Shape"
-  }), /*#__PURE__*/React.createElement("path", {
-    d: "M3.5,2.72795833 L0.322,1.48195833",
-    id: "Shape"
-  }), /*#__PURE__*/React.createElement("path", {
-    d: "M3.5,2.72795833 L6.678,1.48195833",
-    id: "Shape"
   }), /*#__PURE__*/React.createElement("path", {
-    d: "M3.5,6.78125 L3.5,2.72795833",
-    id: "Shape"
-  }))))));
+    d: "M8 7.228 4.822 5.982M8 7.228l3.178-1.246M8 11.281V7.228",
+    stroke: "#212934",
+    strokeLinecap: "round",
+    strokeLinejoin: "round"
+  }));
 };
 export default DynamicDimensionIcon;

package/build/es/components/DimensionsPanel/List/DimensionItem.js

@@ -2,14 +2,15 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import { IconLock16 } from '@dhis2/ui';
+import { CssVariables } from '@dhis2/ui';
+import cx from 'classnames';
 import PropTypes from 'prop-types';
 import React, { Component, createRef } from 'react';
 import DynamicDimensionIcon from '../../../assets/DynamicDimensionIcon.js';
 import { DIMENSION_PROP_NO_ITEMS, getPredefinedDimensionProp } from '../../../modules/predefinedDimensions.js';
 import OptionsButton from './OptionsButton.js';
 import RecommendedIcon from './RecommendedIcon.js';
-import { styles } from './styles/DimensionItem.style.js';
+import style from './styles/DimensionItem.module.css';
 class DimensionItem extends Component {
   constructor() {
     super(...arguments);
@@ -30,23 +31,18 @@ class DimensionItem extends Component {
     _defineProperty(this, "getDimensionIcon", () => {
       const Icon = getPredefinedDimensionProp(this.props.id, 'icon');
       return Icon ? /*#__PURE__*/React.createElement(Icon, {
-        style: styles.fixedDimensionIcon
+        className: style.fixedDimensionIcon
       }) : /*#__PURE__*/React.createElement(DynamicDimensionIcon, {
-        style: styles.dynamicDimensionIcon
+        className: "dynamic-dimension-icon"
       });
     });
     _defineProperty(this, "getDimensionType", () => {
       const {
         id,
-        name,
-        isDeactivated
+        name
       } = this.props;
       return /*#__PURE__*/React.createElement("span", {
-        "data-dimensionid": id,
-        style: {
-          ...styles.text,
-          ...(isDeactivated ? styles.textDeactivated : {})
-        }
+        "data-dimensionid": id
       }, name);
     });
   }
@@ -60,51 +56,63 @@ class DimensionItem extends Component {
       onClick,
       onOptionsClick,
       innerRef,
-      style,
       dataTest,
+      className,
       ...rest
     } = this.props;
     const Icon = this.getDimensionIcon();
     const Label = this.getDimensionType();
-    const itemStyle = isSelected && !isDeactivated ? {
-      ...styles.item,
-      ...styles.selected
-    } : styles.item;
     const optionsRef = /*#__PURE__*/createRef();
+    const LockIcon = /*#__PURE__*/React.createElement("svg", {
+      width: "7",
+      height: "9",
+      fill: "none",
+      xmlns: "http://www.w3.org/2000/svg"
+    }, /*#__PURE__*/React.createElement("path", {
+      fillRule: "evenodd",
+      clipRule: "evenodd",
+      d: "M3.5 1A1.5 1.5 0 0 0 2 2.5V3h3v-.5A1.5 1.5 0 0 0 3.5 1ZM1 2.5V3H0v6h7V3H6v-.5a2.5 2.5 0 0 0-5 0ZM1 8V4h5v4H1Zm3-1V5H3v2h1Z",
+      fill: "none"
+    }));
     const onLabelClick = () => {
       if (!isDeactivated && !getPredefinedDimensionProp(id, DIMENSION_PROP_NO_ITEMS)) {
         onClick(id);
       }
     };
-    return /*#__PURE__*/React.createElement("li", _extends({
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CssVariables, {
+      colors: true
+    }), /*#__PURE__*/React.createElement("li", _extends({
       onMouseOver: this.onMouseOver,
       onMouseLeave: this.onMouseExit,
       ref: innerRef,
-      style: Object.assign({}, itemStyle, style, !isDeactivated && styles.clickable),
+      className: cx(style.item, {
+        [style.deactivated]: isDeactivated,
+        [style.selected]: isSelected && !isDeactivated
+      }, className),
       "data-test": dataTest,
       onClick: onLabelClick
     }, rest), /*#__PURE__*/React.createElement("div", {
-      className: "label",
+      className: style.label,
       tabIndex: 0,
-      style: styles.label,
       "data-test": `${dataTest}-button-${id}`
     }, /*#__PURE__*/React.createElement("div", {
-      style: styles.iconWrapper
+      className: style.iconWrapper
     }, Icon), /*#__PURE__*/React.createElement("div", {
-      style: styles.labelWrapper
-    }, Label, /*#__PURE__*/React.createElement(RecommendedIcon, {
+      className: style.labelWrapper
+    }, /*#__PURE__*/React.createElement("span", {
+      className: style.labelText
+    }, Label), /*#__PURE__*/React.createElement(RecommendedIcon, {
       isRecommended: isRecommended,
       dataTest: `${dataTest}-recommended-icon`
-    })), isLocked && /*#__PURE__*/React.createElement("div", {
-      style: styles.iconWrapper
-    }, /*#__PURE__*/React.createElement(IconLock16, null))), onOptionsClick ? /*#__PURE__*/React.createElement("div", {
-      style: styles.optionsWrapper,
+    }))), onOptionsClick ? /*#__PURE__*/React.createElement("div", {
+      className: style.optionsWrapper,
       ref: optionsRef,
       "data-test": `${dataTest}-menu-${id}`
     }, this.state.mouseOver && !isDeactivated && !isLocked ? /*#__PURE__*/React.createElement(OptionsButton, {
-      style: styles.optionsButton,
       onClick: this.onOptionsClick(id, optionsRef)
-    }) : null) : null);
+    }) : null) : null, isLocked && /*#__PURE__*/React.createElement("div", {
+      className: style.lockWrapper
+    }, LockIcon)));
   }
 }
 DimensionItem.propTypes = {
@@ -112,12 +120,12 @@ DimensionItem.propTypes = {
   isSelected: PropTypes.bool.isRequired,
   // XXX
   name: PropTypes.string.isRequired,
+  className: PropTypes.string,
   dataTest: PropTypes.string,
   innerRef: PropTypes.func,
   isDeactivated: PropTypes.bool,
   isLocked: PropTypes.bool,
   isRecommended: PropTypes.bool,
-  style: PropTypes.object,
   onClick: PropTypes.func,
   onOptionsClick: PropTypes.func
 };

package/build/es/components/DimensionsPanel/List/OptionsButton.js

@@ -1,18 +1,19 @@
+import _JSXStyle from "styled-jsx/style";
 import { IconMore16 } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React from 'react';
 const OptionsButton = _ref => {
   let {
-    style,
     onClick
   } = _ref;
-  return /*#__PURE__*/React.createElement("button", {
-    style: style,
-    onClick: onClick
-  }, /*#__PURE__*/React.createElement(IconMore16, null));
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("button", {
+    onClick: onClick,
+    className: "jsx-2728765288"
+  }, /*#__PURE__*/React.createElement(IconMore16, null)), /*#__PURE__*/React.createElement(_JSXStyle, {
+    id: "2728765288"
+  }, ["button.jsx-2728765288{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;height:20px;width:20px;padding:0;border:none;background:none;outline:none;cursor:pointer;border-top-right-radius:2px;border-bottom-left-radius:2px;}", "button.jsx-2728765288:hover{background-color:rgba(0,0,0,0.09);}"]));
 };
 OptionsButton.propTypes = {
-  style: PropTypes.object,
   onClick: PropTypes.func
 };
 export default OptionsButton;

package/build/es/components/DimensionsPanel/List/RecommendedIcon.js

@@ -10,8 +10,7 @@ const RecommendedIcon = _ref => {
   } = _ref;
   return isRecommended ? /*#__PURE__*/React.createElement(Tooltip, {
     content: i18n.t('Dimension recommended with selected data'),
-    placement: "bottom",
-    maxWidth: 160
+    placement: "bottom"
   }, /*#__PURE__*/React.createElement("div", {
     style: styles.recommendedIcon,
     "data-test": dataTest