Merge pull request #3432 from bettyblocks/acceptance

Release
bettyblocks · Aug 1, 2024 · 9132b70 · 9132b70
2 parents 840fe31 + 5c9eabb
commit 9132b70
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 3 deletions.
diff --git a/.github/workflows/publish_bundle_production.yml b/.github/workflows/publish_bundle_production.yml
@@ -113,4 +113,9 @@ jobs:
         env:
           AZURE_BLOB_ACCOUNT: ${{ secrets.AZURE_BLOB_ACCOUNT_MEDITEL }}
           AZURE_BLOB_ACCOUNT_KEY: ${{ secrets.AZURE_BLOB_ACCOUNT_KEY_MEDITEL }}
-        run: yarn upload-bundle
+        run: yarn upload-bundle
+      - name: upload ca4
+        env:
+          AZURE_BLOB_ACCOUNT: ${{ secrets.AZURE_BLOB_ACCOUNT_CA4 }}
+          AZURE_BLOB_ACCOUNT_KEY: ${{ secrets.AZURE_BLOB_ACCOUNT_KEY_CA4 }}
+        run: yarn upload-bundle
diff --git a/.github/workflows/publish_production.yml b/.github/workflows/publish_production.yml
@@ -123,6 +123,11 @@ jobs:
           AZURE_BLOB_ACCOUNT: ${{ secrets.AZURE_BLOB_ACCOUNT_MEDITEL }}
           AZURE_BLOB_ACCOUNT_KEY: ${{ secrets.AZURE_BLOB_ACCOUNT_KEY_MEDITEL }}
         run: yarn upload
+      - name: upload ca4
+        env:
+          AZURE_BLOB_ACCOUNT: ${{ secrets.AZURE_BLOB_ACCOUNT_CA4 }}
+          AZURE_BLOB_ACCOUNT_KEY: ${{ secrets.AZURE_BLOB_ACCOUNT_KEY_CA4 }}
+        run: yarn upload
       - name: release notes
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## [2.187.6](https://github.com/bettyblocks/material-ui-component-set/compare/v2.187.5...v2.187.6) (2024-07-24)
+
+
+### Bug Fixes
+
+* make the subtitle weight look at the subtitle weight option instead of the title weight ([90880df](https://github.com/bettyblocks/material-ui-component-set/commit/90880dfc866802ca9a74c7ef8e59f28420a6a026))
+
+## [2.187.5](https://github.com/bettyblocks/material-ui-component-set/compare/v2.187.4...v2.187.5) (2024-07-10)
+
+
+### Bug Fixes
+
+* manually trigger updateIndicator to show active tab on page load ([6c8d4ba](https://github.com/bettyblocks/material-ui-component-set/commit/6c8d4bad87f283cab18db70e27da7b2927fe2b60))
+
 ## [2.187.4](https://github.com/bettyblocks/material-ui-component-set/compare/v2.187.3...v2.187.4) (2024-06-19)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "component-set",
-  "version": "2.187.4",
+  "version": "2.187.6",
   "main": "dist/templates.json",
   "license": "UNLICENSED",
   "private": false,

diff --git a/src/components/listItem.js b/src/components/listItem.js
@@ -145,7 +145,7 @@
             fontSize: ({ options: { subtitleFont } }) =>
               style.getFontSize(subtitleFont, 'Desktop'),
           },
-          fontWeight: ({ options: { titleWeight } }) => titleWeight,
+          fontWeight: ({ options: { subtitleWeight } }) => subtitleWeight,
           color: ({ options: { subtitleColor } }) =>
             style.getColor(subtitleColor),
         },

diff --git a/src/components/tabs.js b/src/components/tabs.js
@@ -24,6 +24,7 @@
     const orientation =
       alignment === 'top' || alignment === 'bottom' ? 'horizontal' : 'vertical';
     const isDev = env === 'dev';
+    const tabsRef = useRef();
     const currentTab = isDev ? selectedDesignTabIndex : defaultValue;
     const [value, setValue] = useState(parseInt(currentTab - 1, 10) || 0);
     const [tabData, setTabData] = useState({});
@@ -46,6 +47,12 @@
       }
     }, [isDev, currentTab]);
 
+    useEffect(() => {
+      setTimeout(() => {
+        tabsRef.current.updateIndicator();
+      }, 100);
+    }, []);
+
     B.defineFunction('Next tab', () => {
       if (value + 1 >= children.length) return;
       setValue(value + 1);
@@ -58,6 +65,7 @@
 
     const TabsHeader = (
       <Tabs
+        action={tabsRef}
         aria-label="tabs"
         onChange={handleChange}
         value={value}