Skip to content

Commit

Permalink
Merge branch 'dev' into fix/DatePicker-date-clears-after-invalid-char…
Browse files Browse the repository at this point in the history
…acter-is-added
  • Loading branch information
nikitaorliak-cengage authored Nov 22, 2024
2 parents 8e94771 + 23f6cf0 commit 381775a
Show file tree
Hide file tree
Showing 46 changed files with 840 additions and 286 deletions.
5 changes: 5 additions & 0 deletions .changeset/a11y-charts-space-around-circle-nodes-missing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@react-magma/charts': patch
---

fix(Charts): Fix circle styles for `Charts`.
5 changes: 5 additions & 0 deletions .changeset/fix-docs-examples.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'react-magma-docs': patch
---

fix(Docs): Within the Docs site, these components have had fixes for missing references and general clean-up for CodeSandbox examples: Grid, Container, Stepper, Combobox, Hyperlink, IconButton, Toast, DatePicker, Dropdown, Form, FormGroup, useFocusLock
9 changes: 8 additions & 1 deletion .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"a11y-Stepper-vertical-orientation",
"a11y-breadcrumb-hide-svg-from-screen-readers",
"a11y-button-remove-animation-presses",
"a11y-charts-space-around-circle-nodes-missing",
"a11y-checkBox-labels-not-read",
"a11y-checkbox-hide-svg-from-screen-readers",
"a11y-combobox-clear-focus",
Expand Down Expand Up @@ -50,6 +51,7 @@
"feat-treeview-add-support-for-isdisabled",
"feat-treeview-onexpandedchange",
"fix-blockQuote-border-color",
"fix-docs-examples",
"fix-initial-expanded-items-should-expand-all-parents",
"fix-input-focus-outline",
"fix-input-help-link",
Expand All @@ -67,11 +69,16 @@
"implement-scrollspy-in-docs",
"inputwrapperstyles",
"search-clear-overlaps",
"selecteItemButton-focus",
"sync4-6",
"tag-focus",
"toggleButtonGroup",
"tree-initEx-docs",
"tree-validity",
"treeViewSelectItemsOutside",
"treeview-undefined-2",
"treeview-undefined-3",
"treeview-undefined"
"treeview-undefined",
"treeview-undefined4"
]
}
5 changes: 5 additions & 0 deletions .changeset/selecteItemButton-focus.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'react-magma-dom': patch
---

fix(Combobox/Select:): Fix focus color for selected items when using `isMulti` + `isInverse`
5 changes: 5 additions & 0 deletions .changeset/tag-focus.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'react-magma-dom': patch
---

fix(Tag): Update tag focus state
5 changes: 5 additions & 0 deletions .changeset/toggleButtonGroup.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'react-magma-dom': patch
---

fix(ToggleButtonGroup): Fix `enforced` and `exclusive` props
5 changes: 5 additions & 0 deletions .changeset/tree-validity.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'react-magma-dom': patch
---

fix(TreeView): Fix invalid tree item children
5 changes: 5 additions & 0 deletions .changeset/treeview-undefined4.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'react-magma-dom': patch
---

fix(TreeView): Fix undefined problem
6 changes: 6 additions & 0 deletions packages/charts/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @react-magma/charts

## 10.0.0-next.2

### Patch Changes

- 6869467ff: fix(Charts): Fix circle styles for `Charts`.

## 10.0.0-next.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/charts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-magma/charts",
"version": "10.0.0-next.1",
"version": "10.0.0-next.2",
"publishConfig": {
"access": "public"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/charts/src/components/CarbonChart/CarbonChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -230,15 +230,15 @@ const CarbonChartWrapper = styled.div<{
drop-shadow( 1px 0px 0px ${props =>
props.isInverse
? props.theme.colors.primary600
: props.theme.colors.neutral100});
: props.theme.colors.neutral100})
drop-shadow(-1px 0px 0px ${props =>
props.isInverse
? props.theme.colors.primary600
: props.theme.colors.neutral100});
: props.theme.colors.neutral100})
drop-shadow( 0px 1px 0px ${props =>
props.isInverse
? props.theme.colors.primary600
: props.theme.colors.neutral100});
: props.theme.colors.neutral100})
drop-shadow( 0px -1px 0px ${props =>
props.isInverse
? props.theme.colors.primary600
Expand Down
30 changes: 30 additions & 0 deletions packages/react-magma-dom/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,35 @@
## 4.6.0

## 4.7.0-next.52

### Patch Changes

- c54190d6c: fix(TreeView): Fix undefined problem

## 4.7.0-next.51

### Patch Changes

- 46c70e610: fix(TreeView): Fix invalid tree item children

## 4.7.0-next.50

### Patch Changes

- b8364bbca: fix(ToggleButtonGroup): Fix `enforced` and `exclusive` props

## 4.7.0-next.49

### Patch Changes

- 6a8ed217b: fix(Tag): Update tag focus state

## 4.7.0-next.48

### Patch Changes

- cf959a580: fix(Combobox/Select:): Fix focus color for selected items when using `isMulti` + `isInverse`

## 4.7.0-next.47

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/react-magma-dom/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-magma-dom",
"version": "4.7.0-next.47",
"version": "4.7.0-next.52",
"description": "",
"main": "dist/index.js",
"module": "dist/esm/index.js",
Expand Down
16 changes: 13 additions & 3 deletions packages/react-magma-dom/src/components/Select/shared.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,12 @@ export const SelectText = styled.span<{
: props.theme.colors.neutral500;
}
}};
${props => props.isDisabled && props.isShowPlaceholder && css`
opacity: ${props.isInverse ? 0.4 : 0.6}
`}
${props =>
props.isDisabled &&
props.isShowPlaceholder &&
css`
opacity: ${props.isInverse ? 0.4 : 0.6};
`}
`;

export const StyledCard = styled(Card)<{
Expand Down Expand Up @@ -169,6 +172,13 @@ export const SelectedItemButton = styled.button<{
white-space: nowrap;
min-width: 0%;
outline-offset: 2px;
&:focus {
outline: 2px solid
${props =>
props.isInverse
? props.theme.colors.focusInverse
: props.theme.colors.focus};
}
`;

export const IconWrapper = styled.span`
Expand Down
Loading

0 comments on commit 381775a

Please sign in to comment.