Merge pull request #3560 from bettyblocks/acceptance

Release

CHANGELOG.md

@@ -1,3 +1,18 @@
+# [2.200.0](https://github.com/bettyblocks/material-ui-component-set/compare/v2.199.1...v2.200.0) (2024-12-30)
+
+
+### Features
+
+* add icon, icon position and icon color options to expansion panel ([8f4db94](https://github.com/bettyblocks/material-ui-component-set/commit/8f4db94025f194ba38d037b6a088978e12ea81ea))
+
+## [2.199.1](https://github.com/bettyblocks/material-ui-component-set/compare/v2.199.0...v2.199.1) (2024-12-16)
+
+
+### Bug Fixes
+
+* bump cli version ([df3fd78](https://github.com/bettyblocks/material-ui-component-set/commit/df3fd78aea14af22691a160619269288f2f178b3))
+* bump sdk version ([08d6fab](https://github.com/bettyblocks/material-ui-component-set/commit/08d6fab3f9590e4ed289d7aaeb8facf7cb821ceb))
+
 # [2.199.0](https://github.com/bettyblocks/material-ui-component-set/compare/v2.198.2...v2.199.0) (2024-12-12)
 
 

package.json

@@ -1,11 +1,11 @@
 {
   "name": "component-set",
-  "version": "2.199.0",
+  "version": "2.200.0",
   "main": "dist/templates.json",
   "license": "UNLICENSED",
   "private": false,
   "devDependencies": {
-    "@betty-blocks/cli": "^25.93.0",
+    "@betty-blocks/cli": "^25.101.0",
     "@commitlint/cli": "^16.1.0",
     "@commitlint/config-angular": "^16.0.0",
     "@semantic-release/changelog": "^6.0.1",
@@ -57,7 +57,7 @@
     "dist"
   ],
   "dependencies": {
-    "@betty-blocks/component-sdk": "^1.82.3",
+    "@betty-blocks/component-sdk": "^1.86.1",
     "@date-io/date-fns": "^1.3.13",
     "@material-ui/core": "^4.9.11",
     "@material-ui/icons": "^4.11.2",

src/components/expansionPanel.js

@@ -21,6 +21,8 @@
       square,
       variant,
       elevation,
+      icon,
+      iconPosition,
       dataComponentAttribute,
       preLoadData,
     } = options;
@@ -92,7 +94,10 @@
 
     const panelSummaryOptions = {
       onClick,
-      expandIcon: <Icon name="ExpandMore" />,
+      expandIcon: <Icon name={icon} />,
+      IconButtonProps: {
+        edge: iconPosition,
+      },
     };
 
     const ShowChilderen = <>{dataShown || isDev ? children : ''}</>;
@@ -227,6 +232,13 @@
           marginLeft: ({ options: { outerSpacing } }) =>
             getSpacing(outerSpacing[3], 'Desktop'),
         },
+        '& .MuiExpansionPanelSummary-root': {
+          flexDirection: ({ options: { iconPosition } }) =>
+            iconPosition === 'start' && 'row-reverse',
+        },
+        '& .MuiExpansionPanelSummary-expandIcon': {
+          color: ({ options: { iconColor } }) => style.getColor(iconColor),
+        },
       },
       empty: {
         display: 'flex',

src/prefabs/structures/ExpansionPanel/options/index.ts

@@ -4,6 +4,9 @@ import {
   option,
   showIf,
   sizes,
+  icon,
+  color,
+  ThemeColor,
 } from '@betty-blocks/component-sdk';
 import { styles } from './styles';
 import { advanced } from '../../advanced';
@@ -73,6 +76,20 @@ export const expansionPanelOptions = {
       condition: showIf('variant', 'EQ', 'elevation'),
     },
   }),
+  icon: icon('Icon', { value: 'ExpandMore' }),
+  iconPosition: option('CUSTOM', {
+    label: 'Icon position',
+    value: 'end',
+    configuration: {
+      as: 'BUTTONGROUP',
+      dataType: 'string',
+      allowedInput: [
+        { name: 'Start', value: 'start' },
+        { name: 'End', value: 'end' },
+      ],
+    },
+  }),
+  iconColor: color('Icon color', { value: ThemeColor.DARK }),
   ...styles,
 
   outerSpacing: sizes('Outer space', {

yarn.lock

@@ -154,10 +154,10 @@
     "@babel/helper-validator-identifier" "^7.22.5"
     to-fast-properties "^2.0.0"
 
-"@betty-blocks/cli@^25.93.0":
-  version "25.93.0"
-  resolved "https://registry.yarnpkg.com/@betty-blocks/cli/-/cli-25.93.0.tgz#c09fa087713c36d0da838a5795911dd6d38cda43"
-  integrity sha512-MYHL0G5SrarZSzIqJnJyK/+i4UvOxf76aJWz+40mRY5kPV0yQ1xZX9FSfc8BAZOIWGWZEn1APjQ0l5beNde87w==
+"@betty-blocks/cli@^25.101.0":
+  version "25.101.0"
+  resolved "https://registry.yarnpkg.com/@betty-blocks/cli/-/cli-25.101.0.tgz#953cab8d28e114b17750799825934569f873aad0"
+  integrity sha512-l1RwNnkqxYRh6EjdoUQmgpr4ieraQaShj5l7MN8PRfBz6mYESpRhhPNg/wDDFhDt03v7tABGjz1uCh0IeI4EFA==
   dependencies:
     "@azure/ms-rest-js" "^2.0.4"
     "@azure/storage-blob" "^10.3.0"
@@ -196,10 +196,10 @@
   optionalDependencies:
     isolated-vm "^4.0.0"
 
-"@betty-blocks/component-sdk@^1.82.3":
-  version "1.82.4"
-  resolved "https://registry.yarnpkg.com/@betty-blocks/component-sdk/-/component-sdk-1.82.4.tgz#913bb981e665272d220d8db47b91e7828b331347"
-  integrity sha512-HMa0/T/tLmoO3lrHX8+OptNPynrVkD21HgVU6vOQ9V4bmsqcoh4IEcgvnuAqjSSaIVvlKFWbEqpG83n1ZhfkbQ==
+"@betty-blocks/component-sdk@^1.86.1":
+  version "1.86.1"
+  resolved "https://registry.yarnpkg.com/@betty-blocks/component-sdk/-/component-sdk-1.86.1.tgz#f6d3a8bfafa92e99145ad26fb8826eaa941867b0"
+  integrity sha512-ClXiRk4ihbocKOrr5pvBCD3qwW3jQkUmKLTYKM6FnVEwTHB3Sw1PoekIMdYTmHIhhG755ICTJJHELXdd4nLydw==
 
 "@colors/[email protected]":
   version "1.5.0"
@@ -6761,7 +6761,16 @@ stream-via@^1.0.4:
   resolved "https://registry.yarnpkg.com/stream-via/-/stream-via-1.0.4.tgz#8dccbb0ac909328eb8bc8e2a4bd3934afdaf606c"
   integrity sha512-DBp0lSvX5G9KGRDTkR/R+a29H+Wk2xItOF+MpZLLNDWbEV9tGPnqLPxHEYjmiz8xGtJHRIqmI+hCjmNzqoA4nQ==
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -6842,7 +6851,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -6856,6 +6865,13 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -7598,7 +7614,16 @@ wordwrap@^1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==