Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Next Version Bump #1744

Merged
merged 7 commits into from
Jun 9, 2023
Merged

Next Version Bump #1744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
727f0bf
export Divider component
majabi May 24, 2023
b06e119
Merge pull request #1743 from Kajabi/DSS-410-export-divider-component
majabi May 25, 2023
a86883f
fix(alert): correct react component icon display
teenwolfblitzer Jun 7, 2023
7e736ed
test(alert): revise spec to match updated icons
teenwolfblitzer Jun 7, 2023
17b67fc
feat(radio): render css_classes output
teenwolfblitzer Jun 8, 2023
2dcb90b
Merge pull request #1745 from Kajabi/DSS-420_react_alert_icon_mismatch
teenwolfblitzer Jun 8, 2023
7cc4e98
Merge pull request #1746 from Kajabi/DSS-421_radio_css_classes_output
teenwolfblitzer Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/lib/sage_rails/app/views/sage_components/_sage_radio.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>
>
Expand Down
8 changes: 4 additions & 4 deletions packages/sage-react/lib/Alert/Alert.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions packages/sage-react/lib/Alert/Alert.spec.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
1 change: 1 addition & 0 deletions packages/sage-react/lib/Divider/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { Divider } from './Divider';
1 change: 1 addition & 0 deletions packages/sage-react/lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down