From 097d53fd2aa09ebaed420d4e9f3bd6035dcf5860 Mon Sep 17 00:00:00 2001 From: Julian Skinner Date: Wed, 31 Jul 2024 11:41:41 -0500 Subject: [PATCH 1/3] fix(sage-icon): add html_attributes to render on pds-icon (#1916) Co-authored-by: Julian Skinner --- .../lib/sage_rails/app/views/sage_components/_sage_icon.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/lib/sage_rails/app/views/sage_components/_sage_icon.html.erb b/docs/lib/sage_rails/app/views/sage_components/_sage_icon.html.erb index 31cdeaf45b..78f2c88b40 100644 --- a/docs/lib/sage_rails/app/views/sage_components/_sage_icon.html.erb +++ b/docs/lib/sage_rails/app/views/sage_components/_sage_icon.html.erb @@ -32,6 +32,7 @@ end <%= component.generated_css_classes %> " size="<%= "#{component.size}" if component.size.present? %>" + <%= component.generated_html_attributes.html_safe %> > <% if component.card_color.present? %> From 234791541e42bfa22b561c59dea9bd06330e0575 Mon Sep 17 00:00:00 2001 From: Phillip Lovelace Date: Wed, 31 Jul 2024 10:10:46 -0700 Subject: [PATCH 2/3] fix: converts select icon to pds-icon (#1918) * fix: converts select icon to pds-icon * fix: correct lint error --- packages/sage-react/lib/Select/Select.jsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/sage-react/lib/Select/Select.jsx b/packages/sage-react/lib/Select/Select.jsx index b82d8bc1fa..9da3cca82e 100644 --- a/packages/sage-react/lib/Select/Select.jsx +++ b/packages/sage-react/lib/Select/Select.jsx @@ -1,6 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import classnames from 'classnames'; +import { SageTokens } from '../configs'; export const Select = ({ className, @@ -78,7 +79,13 @@ export const Select = ({ : buildOption(option, i) ))} -