Merge pull request #1744 from Kajabi/develop

Next Version Bump
Kajabi · Jun 9, 2023 · 4b8cc15 · 4b8cc15
2 parents bce3390 + 7cc4e98
commit 4b8cc15
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/docs/lib/sage_rails/app/views/sage_components/_sage_radio.html.erb b/docs/lib/sage_rails/app/views/sage_components/_sage_radio.html.erb
@@ -26,6 +26,7 @@
       <%= "sage-radio--custom" if content_for :sage_radio_custom_content %>
       <%= component.has_border ? "sage-radio--has-border" : "" %>
       <%= component.has_error ? "sage-radio--error" : "" %>
+      <%= component.generated_css_classes %>
     "
     <%= component.generated_html_attributes.html_safe %>
   >

diff --git a/packages/sage-react/lib/Alert/Alert.jsx b/packages/sage-react/lib/Alert/Alert.jsx
@@ -40,13 +40,13 @@ export const Alert = ({
   const getDefaultIcon = () => {
     switch (color) {
       case ALERT_COLORS.WARNING:
-        return SageTokens.ICONS.WARNING_FILLED;
+        return SageTokens.ICONS.DANGER_FILLED;
       case ALERT_COLORS.APPROACHING:
-        return SageTokens.ICONS.WARNING_FILLED;
-      case ALERT_COLORS.DANGER:
         return SageTokens.ICONS.DANGER_FILLED;
+      case ALERT_COLORS.DANGER:
+        return SageTokens.ICONS.WARNING_FILLED;
       case ALERT_COLORS.EXCEEDED:
-        return SageTokens.ICONS.DANGER_FILLED;
+        return SageTokens.ICONS.WARNING_FILLED;
       case ALERT_COLORS.REACHED:
         return SageTokens.ICONS.FLAG;
       case ALERT_COLORS.SUCCESS:

diff --git a/packages/sage-react/lib/Alert/Alert.spec.jsx b/packages/sage-react/lib/Alert/Alert.spec.jsx
@@ -15,13 +15,13 @@ function setup(defaultProps = {
 }
 
 const colorList = {
-  [ALERT_COLORS.APPROACHING]: SageTokens.ICONS.WARNING_FILLED,
-  [ALERT_COLORS.DANGER]: SageTokens.ICONS.DANGER_FILLED,
-  [ALERT_COLORS.EXCEEDED]: SageTokens.ICONS.DANGER_FILLED,
+  [ALERT_COLORS.APPROACHING]: SageTokens.ICONS.DANGER_FILLED,
+  [ALERT_COLORS.DANGER]: SageTokens.ICONS.WARNING_FILLED,
+  [ALERT_COLORS.EXCEEDED]: SageTokens.ICONS.WARNING_FILLED,
   [ALERT_COLORS.INFO]: SageTokens.ICONS.INFO_CIRCLE_FILLED,
   [ALERT_COLORS.REACHED]: SageTokens.ICONS.FLAG,
   [ALERT_COLORS.SUCCESS]: SageTokens.ICONS.CHECK_CIRCLE_FILLED,
-  [ALERT_COLORS.WARNING]: SageTokens.ICONS.WARNING_FILLED,
+  [ALERT_COLORS.WARNING]: SageTokens.ICONS.DANGER_FILLED,
 };
 
 describe('Sage Alert', () => {

diff --git a/packages/sage-react/lib/Divider/index.js b/packages/sage-react/lib/Divider/index.js
@@ -0,0 +1 @@
+export { Divider } from './Divider';
diff --git a/packages/sage-react/lib/index.js b/packages/sage-react/lib/index.js
@@ -11,6 +11,7 @@ export { Carousel } from './Carousel';
 export { Chart } from './Chart';
 export { Choice } from './Choice';
 export { Description } from './Description';
+export { Divider } from './Divider';
 export { Dot } from './Dot';
 export { Drawer } from './Drawer';
 export {