From 906b5fa453c118f3ee23068e36007a8678ef3d37 Mon Sep 17 00:00:00 2001 From: Phillip Lovelace Date: Tue, 7 May 2024 13:45:28 -0700 Subject: [PATCH 1/3] Next Version Bump (#1881) * fix(switch): correct spacing value * feat(icons): Update icon font (v.27) (#1884) * feat(icons): add new icons to _icon.scss * feat(icons): add new icons to sage_tokens.rb * feat(icons): add new icons to icons.js * feat(icons): increment cdn-version variable * fix(dropdown): resolve sentry errors in positionElement (#1883) * fix(dropdown): resolve sentry error in positionElement * test(dropdown): remove trailing spaces * fix(dropdown): remove trailing whitespace --------- Co-authored-by: Quinton Jason --- docs/lib/sage_rails/app/sage_tokens/sage_tokens.rb | 3 +++ .../sage-assets/lib/stylesheets/components/_icon.scss | 2 +- .../sage-assets/lib/stylesheets/components/_switch.scss | 2 +- packages/sage-assets/lib/stylesheets/tokens/_icon.scss | 3 +++ packages/sage-react/lib/Dropdown/Dropdown.jsx | 3 +++ packages/sage-react/lib/configs/tokens/icons.js | 3 +++ packages/sage-system/lib/dropdown.js | 9 ++++++--- 7 files changed, 20 insertions(+), 5 deletions(-) diff --git a/docs/lib/sage_rails/app/sage_tokens/sage_tokens.rb b/docs/lib/sage_rails/app/sage_tokens/sage_tokens.rb index c0ff308314..2028d31aec 100644 --- a/docs/lib/sage_rails/app/sage_tokens/sage_tokens.rb +++ b/docs/lib/sage_rails/app/sage_tokens/sage_tokens.rb @@ -176,6 +176,7 @@ def SageTokens.grid_templates "color", "columns", "comment", + "comment-no", "connect", "contact", "conversation", @@ -300,6 +301,8 @@ def SageTokens.grid_templates "microphone-off", "monitor", "monitor-filled", + "more-menu", + "more-menu-filled", "move-left", "move-right", "multi-pay", diff --git a/packages/sage-assets/lib/stylesheets/components/_icon.scss b/packages/sage-assets/lib/stylesheets/components/_icon.scss index 508fee4ff5..385870e667 100644 --- a/packages/sage-assets/lib/stylesheets/components/_icon.scss +++ b/packages/sage-assets/lib/stylesheets/components/_icon.scss @@ -4,7 +4,7 @@ /// @group sage //// -$-icon-font-cdn-version: "26"; // Keep in sync with desired `vX` folder from CDN +$-icon-font-cdn-version: "27"; // Keep in sync with desired `vX` folder from CDN $-icon-font-path: "#{$sage-font-cdn-root}/sage/v#{$-icon-font-cdn-version}" !default; $-icon-font-version: 1; // Only used for cache busting so increment as needed for such purposes diff --git a/packages/sage-assets/lib/stylesheets/components/_switch.scss b/packages/sage-assets/lib/stylesheets/components/_switch.scss index 423a894c1f..96c9cf7afb 100644 --- a/packages/sage-assets/lib/stylesheets/components/_switch.scss +++ b/packages/sage-assets/lib/stylesheets/components/_switch.scss @@ -19,7 +19,7 @@ $-switch-color-error: sage-color(red, 300); $-switch-focus-outline-error-color: sage-color(red, 200); // Switch -$-switch-label-left-spacing: sage-spacing(xs); +$-switch-label-left-spacing: rem(12px); $-switch-border-radius: rem(16px); $-switch-height: rem(20px); $-switch-width: rem(36px); diff --git a/packages/sage-assets/lib/stylesheets/tokens/_icon.scss b/packages/sage-assets/lib/stylesheets/tokens/_icon.scss index 716ab2088b..4121649ada 100644 --- a/packages/sage-assets/lib/stylesheets/tokens/_icon.scss +++ b/packages/sage-assets/lib/stylesheets/tokens/_icon.scss @@ -117,6 +117,7 @@ $sage-icons: ( color: unicode(e940), columns: unicode(e941), comment: unicode(e942), + comment-no: unicode(ea2a), connect: unicode(e943), contact: unicode(e944), conversation: unicode(e945), @@ -241,6 +242,8 @@ $sage-icons: ( microphone-off: unicode(e996), monitor: unicode(e997), monitor-filled: unicode(e998), + more-menu: unicode(ea2b), + more-menu-filled: unicode(ea2c), move-left: unicode(e999), move-right: unicode(e99a), multi-pay: unicode(e99b), diff --git a/packages/sage-react/lib/Dropdown/Dropdown.jsx b/packages/sage-react/lib/Dropdown/Dropdown.jsx index 0f1f0f634e..efbfc34746 100644 --- a/packages/sage-react/lib/Dropdown/Dropdown.jsx +++ b/packages/sage-react/lib/Dropdown/Dropdown.jsx @@ -84,6 +84,9 @@ export const Dropdown = ({ const button = el; const panel = el.lastElementChild; + // if panel is null, return + if (!panel) return; + // Dimensions const buttonDimensions = button.getBoundingClientRect(); const panelDimensions = panel.getBoundingClientRect(); diff --git a/packages/sage-react/lib/configs/tokens/icons.js b/packages/sage-react/lib/configs/tokens/icons.js index 5eb0379028..eb31c04ed6 100644 --- a/packages/sage-react/lib/configs/tokens/icons.js +++ b/packages/sage-react/lib/configs/tokens/icons.js @@ -76,6 +76,7 @@ export const TOKENS_ICONS = { CODE_BLOCK: 'code-block', COLOR: 'color', COMMENT: 'comment', + COMMENT_NO: 'comment-no', CONNECT: 'connect', CONVERSATION: 'conversation', CONTACT: 'contact', @@ -199,6 +200,8 @@ export const TOKENS_ICONS = { MERGE: 'merge', MICROPHONE: 'microphone', MICROPHONE_OFF: 'microphone-off', + MORE_MENU: 'more-menu', + MORE_MENU_FILLED: 'more-menu-filled', MONITOR: 'monitor', MONITOR_FILLED: 'monitor-filled', MOVE_LEFT: 'move-left', diff --git a/packages/sage-system/lib/dropdown.js b/packages/sage-system/lib/dropdown.js index bcbfb50fae..95f5e962b5 100644 --- a/packages/sage-system/lib/dropdown.js +++ b/packages/sage-system/lib/dropdown.js @@ -195,13 +195,16 @@ Sage.dropdown = (function () { let directionX = null; let directionY = null; - + // Elements const button = dropdownElement; const panel = dropdownElement.lastElementChild; const win = panel.ownerDocument.defaultView; const docEl = window.document.documentElement; + // if panel is null, return + if (!panel) return; + panel.style.top = ''; // resets the style panel.style.left = ''; // resets the style panel.style.right = ''; // resets the style @@ -235,7 +238,7 @@ Sage.dropdown = (function () { const enoughSpaceBelow = viewport.bottom > (offset.bottom + panelHeight); const enoughSpaceLeft = viewport.left < (offset.left + panelWidth); const enoughSpaceRight = viewport.right > (offset.right + panelWidth); - + // Check if there is enough space to the top or bottom if (!enoughSpaceBelow && enoughSpaceAbove) { directionY = 'above'; @@ -248,7 +251,7 @@ Sage.dropdown = (function () { } else if (directionY === 'below') { // find test case // panel.style.top = 0; - } + } // Check if there is enough space to the left or right if (!enoughSpaceRight && enoughSpaceLeft) { From 7cff250a1fac062acdde757e98f906d27402efa2 Mon Sep 17 00:00:00 2001 From: Kajabi Automation Bot Date: Tue, 7 May 2024 20:53:14 +0000 Subject: [PATCH 2/3] chore(ci): updating rails gem version [ci skip] --- docs/Gemfile.lock | 2 +- docs/lib/sage_rails/lib/sage_rails/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index b480d0d6f8..2f9fe1fd67 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: lib/sage_rails specs: - sage_rails (5.20.3) + sage_rails (5.20.4) classy_hash rails diff --git a/docs/lib/sage_rails/lib/sage_rails/version.rb b/docs/lib/sage_rails/lib/sage_rails/version.rb index a810e98c7f..4ffc9359f7 100644 --- a/docs/lib/sage_rails/lib/sage_rails/version.rb +++ b/docs/lib/sage_rails/lib/sage_rails/version.rb @@ -1,3 +1,3 @@ module SageRails - VERSION = "5.20.3" + VERSION = "5.20.4" end From 8ac5a1d6b8573652caec99bdfb6b8d95de9647b2 Mon Sep 17 00:00:00 2001 From: Kajabi Automation Bot Date: Tue, 7 May 2024 20:53:15 +0000 Subject: [PATCH 3/3] chore(release): publish [skip ci] - @kajabi/sage@5.20.4 - @kajabi/sage-assets@1.14.4 - @kajabi/sage-packs@1.1.4 - @kajabi/sage-react@1.19.4 - @kajabi/sage-system@1.3.2 --- docs/CHANGELOG.md | 8 ++++++++ docs/package.json | 4 ++-- packages/sage-assets/CHANGELOG.md | 8 ++++++++ packages/sage-assets/package.json | 2 +- packages/sage-packs/CHANGELOG.md | 8 ++++++++ packages/sage-packs/package.json | 8 ++++---- packages/sage-react/CHANGELOG.md | 8 ++++++++ packages/sage-react/package.json | 4 ++-- packages/sage-system/CHANGELOG.md | 8 ++++++++ packages/sage-system/package.json | 2 +- 10 files changed, 50 insertions(+), 10 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index bdef0267da..fecc77ecf8 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [5.20.4](https://github.com/Kajabi/sage-lib/compare/@kajabi/sage@5.20.3...@kajabi/sage@5.20.4) (2024-05-07) + +**Note:** Version bump only for package @kajabi/sage + + + + + ## [5.20.3](https://github.com/Kajabi/sage-lib/compare/@kajabi/sage@5.20.2...@kajabi/sage@5.20.3) (2024-04-19) **Note:** Version bump only for package @kajabi/sage diff --git a/docs/package.json b/docs/package.json index 4d26ddc6eb..801273767f 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "@kajabi/sage", - "version": "5.20.3", + "version": "5.20.4", "description": "The Sage Design System (SDS) is our single source of truth, providing everything you need to build great products for our customers. It is the culmination of designers and developers working together to give teams the ability to ship high-quality products faster.", "main": "sage/pages/index", "directories": { @@ -38,7 +38,7 @@ "@babel/core": "^7.12.3", "@babel/plugin-proposal-private-property-in-object": "^7.21.11", "@babel/plugin-transform-runtime": "^7.12.1", - "@kajabi/sage-packs": "^1.1.3", + "@kajabi/sage-packs": "^1.1.4", "@rails/webpacker": "5.2.2", "arrive": "^2.4.1", "core-js": "^3.6.5", diff --git a/packages/sage-assets/CHANGELOG.md b/packages/sage-assets/CHANGELOG.md index 44feccb23c..76e83751d6 100644 --- a/packages/sage-assets/CHANGELOG.md +++ b/packages/sage-assets/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.14.4](https://github.com/Kajabi/sage-lib/compare/@kajabi/sage-assets@1.14.3...@kajabi/sage-assets@1.14.4) (2024-05-07) + +**Note:** Version bump only for package @kajabi/sage-assets + + + + + ## [1.14.3](https://github.com/Kajabi/sage-lib/compare/@kajabi/sage-assets@1.14.2...@kajabi/sage-assets@1.14.3) (2024-04-19) **Note:** Version bump only for package @kajabi/sage-assets diff --git a/packages/sage-assets/package.json b/packages/sage-assets/package.json index 5337f82ece..63e8491d81 100644 --- a/packages/sage-assets/package.json +++ b/packages/sage-assets/package.json @@ -1,6 +1,6 @@ { "name": "@kajabi/sage-assets", - "version": "1.14.3", + "version": "1.14.4", "description": "Assets", "main": "dist/main.css", "repository": { diff --git a/packages/sage-packs/CHANGELOG.md b/packages/sage-packs/CHANGELOG.md index 6051209186..8087e0e5c4 100644 --- a/packages/sage-packs/CHANGELOG.md +++ b/packages/sage-packs/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.1.4](https://github.com/Kajabi/sage-lib/compare/@kajabi/sage-packs@1.1.3...@kajabi/sage-packs@1.1.4) (2024-05-07) + +**Note:** Version bump only for package @kajabi/sage-packs + + + + + ## [1.1.3](https://github.com/Kajabi/sage-lib/compare/@kajabi/sage-packs@1.1.2...@kajabi/sage-packs@1.1.3) (2024-04-19) diff --git a/packages/sage-packs/package.json b/packages/sage-packs/package.json index 7ad3d70fd3..0fe0bd2575 100644 --- a/packages/sage-packs/package.json +++ b/packages/sage-packs/package.json @@ -1,6 +1,6 @@ { "name": "@kajabi/sage-packs", - "version": "1.1.3", + "version": "1.1.4", "description": "Sage Packs", "keywords": [ "sage", @@ -31,9 +31,9 @@ "url": "https://github.com/Kajabi/sage-lib/issues" }, "dependencies": { - "@kajabi/sage-assets": "^1.14.3", - "@kajabi/sage-react": "^1.19.3", - "@kajabi/sage-system": "^1.3.1" + "@kajabi/sage-assets": "^1.14.4", + "@kajabi/sage-react": "^1.19.4", + "@kajabi/sage-system": "^1.3.2" }, "devDependencies": { "eslint": "^7.17.0", diff --git a/packages/sage-react/CHANGELOG.md b/packages/sage-react/CHANGELOG.md index 239dbb93ec..cdca94e0f3 100644 --- a/packages/sage-react/CHANGELOG.md +++ b/packages/sage-react/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.19.4](https://github.com/Kajabi/sage-lib/compare/@kajabi/sage-react@1.19.3...@kajabi/sage-react@1.19.4) (2024-05-07) + +**Note:** Version bump only for package @kajabi/sage-react + + + + + ## [1.19.3](https://github.com/Kajabi/sage-lib/compare/@kajabi/sage-react@1.19.2...@kajabi/sage-react@1.19.3) (2024-04-19) diff --git a/packages/sage-react/package.json b/packages/sage-react/package.json index 2ca8314e0b..581b608f01 100644 --- a/packages/sage-react/package.json +++ b/packages/sage-react/package.json @@ -1,6 +1,6 @@ { "name": "@kajabi/sage-react", - "version": "1.19.3", + "version": "1.19.4", "description": "React Components", "keywords": [ "react", @@ -83,7 +83,7 @@ "webpack-cli": "^3.3.12" }, "dependencies": { - "@kajabi/sage-assets": "^1.14.3", + "@kajabi/sage-assets": "^1.14.4", "classnames": "^2.2.6", "debounce": "^1.2.0", "focus-trap": "^6.2.2", diff --git a/packages/sage-system/CHANGELOG.md b/packages/sage-system/CHANGELOG.md index 3e4249daf0..edae550d46 100644 --- a/packages/sage-system/CHANGELOG.md +++ b/packages/sage-system/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.3.2](https://github.com/Kajabi/sage-lib/compare/@kajabi/sage-system@1.3.1...@kajabi/sage-system@1.3.2) (2024-05-07) + +**Note:** Version bump only for package @kajabi/sage-system + + + + + ## [1.3.1](https://github.com/Kajabi/sage-lib/compare/@kajabi/sage-system@1.3.0...@kajabi/sage-system@1.3.1) (2024-03-26) diff --git a/packages/sage-system/package.json b/packages/sage-system/package.json index 0483a2d651..02b9da19fb 100644 --- a/packages/sage-system/package.json +++ b/packages/sage-system/package.json @@ -1,6 +1,6 @@ { "name": "@kajabi/sage-system", - "version": "1.3.1", + "version": "1.3.2", "description": "Sage System", "keywords": [ "sage",