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.

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

AgGrid Next #2601

Closed
wants to merge 46 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
fdea72b
add delay to chromatic snapshots (#2599)
alycrys Oct 12, 2023
7e6fd05
Ag grid theme - add cypress tests (#2614)
alycrys Oct 23, 2023
ee37545
Update yarn.lock
alycrys Oct 23, 2023
e3f3324
Update yarn.lock
alycrys Oct 23, 2023
9bfec81
Merge branch 'main' into ag-grid-next
alycrys Oct 23, 2023
14c14ce
Update yarn.lock
alycrys Oct 24, 2023
ff825aa
Merge branch 'main' into ag-grid-next
alycrys Oct 26, 2023
59244b4
Merge branch 'main' into ag-grid-next
alycrys Oct 30, 2023
d4a2b89
Merge branch 'main' into ag-grid-next
alycrys Nov 9, 2023
bbee640
[Ag Grid Theme] test UITK theme (#2699)
alycrys Nov 14, 2023
858f18f
Merge branch 'main' into ag-grid-next
alycrys Nov 14, 2023
c9979b7
Merge branch 'main' into ag-grid-next
alycrys Nov 15, 2023
ba02e14
Merge branch 'main' into ag-grid-next
alycrys Nov 17, 2023
02e43c9
Merge branch 'main' into ag-grid-next
alycrys Nov 22, 2023
883967a
[Ag Grid Theme] Ag grid v30 - no sass (#2661)
alycrys Nov 24, 2023
adc8c32
Merge branch 'main' into ag-grid-next
alycrys Nov 24, 2023
38c8193
Merge branch 'main' into ag-grid-next
alycrys Nov 24, 2023
81c1b46
Merge branch 'main' into ag-grid-next
alycrys Nov 28, 2023
10c7101
use content characteristic
alycrys Nov 28, 2023
963c1f6
Merge branch 'main' into ag-grid-next
alycrys Nov 28, 2023
7f23a4f
Merge branch 'main' into ag-grid-next
alycrys Nov 30, 2023
8c478f3
Create tasty-trains-cover.md
alycrys Nov 30, 2023
1934cd8
Update tasty-trains-cover.md
alycrys Nov 30, 2023
2998ec5
AG Grid Theme site docs (#2796)
alycrys Nov 30, 2023
3a35a36
fixes
alycrys Nov 30, 2023
df1da39
Merge branch 'ag-grid-next' of https://github.com/jpmorganchase/salt-…
alycrys Nov 30, 2023
af807dd
Merge branch 'main' into ag-grid-next
alycrys Nov 30, 2023
8ef41aa
Update build.mjs
alycrys Dec 1, 2023
2c510d1
Update package.json
alycrys Dec 1, 2023
444e500
Merge branch 'main' into ag-grid-next
alycrys Dec 7, 2023
6b5ea54
Update yarn.lock
alycrys Dec 7, 2023
0cb9b17
Ag grid test range selection (#2827)
alycrys Dec 8, 2023
8154527
Ag grid theme tooltip test (#2654)
alycrys Dec 8, 2023
1a0138c
Merge branch 'main' into ag-grid-next
alycrys Dec 11, 2023
1e19310
[AG Grid Theme] Update icons (#2849)
alycrys Dec 14, 2023
5e16b0e
Merge branch 'main' into ag-grid-next
alycrys Dec 14, 2023
778928f
Merge branch 'ag-grid-next' of https://github.com/jpmorganchase/salt-…
alycrys Dec 14, 2023
c9f741a
Update yarn.lock
alycrys Dec 14, 2023
1eac649
Merge branch 'main' into ag-grid-next
alycrys Dec 19, 2023
b85e53d
Merge branch 'main' into ag-grid-next
alycrys Jan 12, 2024
b7f4fe3
fix editable cell bug
alycrys Jan 12, 2024
9504376
Merge branch 'main' into ag-grid-next
alycrys Jan 12, 2024
37b935f
Merge branch 'main' into ag-grid-next
alycrys Jan 23, 2024
c871de0
Update salt-ag-grid-theme.css
alycrys Jan 23, 2024
703bdad
Update salt-ag-grid-theme.css
alycrys Jan 24, 2024
abe2b35
Merge branch 'main' into ag-grid-next
alycrys Jan 24, 2024
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
Prev Previous commit
Next Next commit
Merge branch 'main' into ag-grid-next
  • Loading branch information
alycrys committed Jan 12, 2024
commit b85e53de56485359c0e8f4caab8fb38a6c40b91d
6 changes: 6 additions & 0 deletions .changeset/chilled-wombats-marry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@salt-ds/theme": minor
---

Added `--salt-color-white-fade-backdrop` token with value `rgba(255, 255, 255, var(--salt-palette-opacity-backdrop))`
Updated `--salt-color-black-fade-backdrop` token to value `rgba(0, 0, 0, var(--salt-palette-opacity-backdrop))`
6 changes: 6 additions & 0 deletions .changeset/flat-rats-cheer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@salt-ds/core": patch
"@salt-ds/lab": patch
---

Updated @floating-ui/react to 0.26.5.
6 changes: 6 additions & 0 deletions .changeset/heavy-pots-yell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@salt-ds/core": patch
"@salt-ds/lab": patch
---

Removed redundant Icon color overrides.
5 changes: 5 additions & 0 deletions .changeset/hot-teachers-know.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@salt-ds/core": patch
---

Fixed FloatingComponent types
5 changes: 0 additions & 5 deletions .changeset/moody-hornets-sleep.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/seven-rocks-doubt.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@salt-ds/core": patch
---

Fixed Input placeholder color.
5 changes: 5 additions & 0 deletions .changeset/strange-years-compare.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@salt-ds/ag-grid-theme": patch
---

Update header icon alignment. Adding space between the text and the icon, so the icon will be aligned opposite the text.
10 changes: 10 additions & 0 deletions .changeset/tidy-pears-swim.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
"@salt-ds/lab": patch
---

Changes to Pagination:

- Removed `compact` prop from `Pagination` component. Replaced by new `CompactPaginator` composition component
- Removed `showPreviousNext` and `FormFieldProps` from `Paginator` component.
- Added `CompactPaginator` for the compact version of pagination.
- Removed `FormFieldProps` from `GoToInput` component and added `inputRef` and `inputVariant`
4 changes: 2 additions & 2 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ jobs:
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
exitOnceUploaded: true
# Turbosnap if this is not the main branch
# onlyChanged: true
# externals: "packages/theme/**/*.css"
onlyChanged: true
externals: "packages/(theme|ag-grid-theme)/**"
skip: "changeset-release/*"
autoAcceptChanges: "main"
ignoreLastBuildOnBranch: "!(main)**"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
with:
install: false
command: yarn run test:components
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: cypress-screenshots
Expand Down
2 changes: 1 addition & 1 deletion .yarn/patches/modular-scripts-npm-3.6.0-d967962075.patch
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ index 3173ab0eb0ab508676a4e09c68c6da07f6d54070..60ed60feb3653cf56a1e7890681f187e
*/
const DEPS_TO_CHECK = [// These are packages most likely to break in practice.
-'esbuild', 'eslint', 'webpack', 'webpack-dev-server']; // We assume that having wrong versions of these
+'esbuild', 'webpack', 'webpack-dev-server']; // We assume that having wrong versions of these
+'esbuild', 'webpack-dev-server']; // We assume that having wrong versions of these
// in the tree will likely break your setup.
// This is a relatively low-effort way to find common issues.

Expand Down
94 changes: 94 additions & 0 deletions content-style-guide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
# Salt content style guide

Content written for Salt should follow this style guide. This includes component documentation, pattern guides and other website pages.

Use American English and follow general guidance for producing clear content—concise, active voice, second person, present tense.

## Guidance

Entries are listed in alphabetical order.

### Arrow keys

The correct terms for the four arrow buttons on a keyboard are:

- <kbd>Up arrow</kbd>
- <kbd>Down arrow</kbd>
- <kbd>Left arrow</kbd>
- <kbd>Right arrow</kbd>

### Best practices

Use as a section header where necessary to draw the reader's attention to recommended tips and guidance. Never skip levels when using section headers. See the section section below for more information.

"Best practices" is preferred to "guidance" as it provides greater clarity on what a reader can expect from the section, and provides greater differentiation from other parts of the section.

### Components

Write the term components in sentence case.

When referring to the component as a whole, use Pascal case wrapped in back ticks. Use the name of the component as it appears in code, i.e. `PillNext` rather than `Pill`.

It's likely you will need to use this version if:

- You are introducing the component in a document for the first time.
- You are recommending the component in a document where the component is not a primary subject.
- You are describing a release or new version of the component.
- You are describing how to import the component for use in a project.

When referring to an instance of a component, use sentence case. **If in doubt, use sentence case**.

Here is an example of a correctly-formatted sentence: "I see `Button` has just been released. My project has so many buttons."

### Foundations

Used when referring to the Salt foundations. Avoid the term if not referring to the Salt foundations (or foundations in another design system) to reduce confusion.

Write both the term foundation and the name of the foundation in sentence case, e.g. "Read more in the size foundation."

### Key combinations

Wrap individual keys in \<kbd> tags.

Remember that when using the `KeyboardControl` component to produce a table, the component adds these tags to keys in the function column. Don't worry about adding tags elsewhere in the table, as it would make the table very large and hard to read.

Place modifier keys, such as Shift, before other keys in a combination.

Use + to separate keys within a combination. Add a space to either side of +.

Use / to separate alternative keys or key combinations. Add a space to either side of /.

### Patterns

Used when referring to the Salt patterns. Avoid the term if not referring to the Salt patterns (or patterns in another design system) to reduce confusion.

Write both the term pattern and the name of the pattern in sentence case, e.g. "Refer to the button bar pattern."

### Prop

Use prop, do not use property. Wrap the prop in back ticks. Write out the statement in full to make the formatting clear.

- Correct: "Set `wrap={true}`"
- Incorrect: "Set the `wrap` prop to `true`"

Outline the simplest possible complete statement. When a user can use a prop with no values, such as `aria-hidden`, recommend the reader use it as-is, rather than passing a Boolean or a string value. When a user can pass a Boolean or string value, prefer Boolean where possible.

### Salt

The name of the design system is Salt. You can describe Salt as a design system, i.e. "We used the Salt design system in our project."

Do not use Salt Design System, Salt DS, or SALT.

### Sections

Section levels should always follow a clear order—as an example, an H3 should follow an H2 or another H3. Refer to the [W3C guidance](https://www.w3.org/WAI/tutorials/page-structure/headings/) for more information.

### Space

Use <kbd>Space</kbd> to refer to the keyboard button. Use \<kbd> tags where appropriate. Don't use <kbd>Spacebar</kbd>.

### Tab

Use <kbd>Tab</kbd> to refer to the keyboard button. Use \<kbd> tags where appropriate. Avoid the term tabbing where possible.

Use tab order. Don't use tabbing order.
72 changes: 71 additions & 1 deletion cypress/support/assertions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ declare global {
```
* */
(chainer: "have.accessibleName"): Chainable<Subject>;

/**
* Checks if the accessible name computation (according to `accname` spec)
* does NOT match the expectation.
Expand All @@ -50,6 +49,26 @@ declare global {
```
* */
(chainer: "not.have.accessibleName"): Chainable<Subject>;
/**
* Checks if the accessible name computation (according to `accname` spec)
* matches the expectation.
*
* @example
```
cy.findByRole('button).should('have.accessibleDescription','Close')
```
* */
(chainer: "have.accessibleDescription"): Chainable<Subject>;
/**
* Checks if the accessible name computation (according to `accname` spec)
* does NOT match the expectation.
*
* @example
```
cy.findByRole('button).should('not.have.accessibleDescription','Close')
```
* */
(chainer: "not.have.accessibleDescription"): Chainable<Subject>;
/**
* Checks if the announcement is matches the expectation.
*
Expand Down Expand Up @@ -133,6 +152,24 @@ declare global {
```
* */
(chainer: "not.be.inTheViewport"): Chainable<Subject>;
/**
* Checks if the element is the active descendant.
*
* @example
```
cy.findByRole('option).should('be.activeDescendant')
```
* */
(chainer: "be.activeDescendant"): Chainable<Subject>;
/**
* Checks if the element is not the active descendant.
*
* @example
```
cy.findByRole('option).should('not.be.activeDescendant')
```
* */
(chainer: "not.be.activeDescendant"): Chainable<Subject>;
}
}
}
Expand Down Expand Up @@ -412,4 +449,37 @@ const isInTheViewport: ChaiPlugin = (_chai, utils) => {
// registers our assertion function "isInTheViewport" with Chai
chai.use(isInTheViewport);

/**
* Checks if the element is in the viewport
*
* @example
* cy.findByRole('option).should('be.activeDescendant')
*/
const isActiveDescendant: ChaiPlugin = (_chai) => {
function assertIsActiveDescendant(this: AssertionStatic) {
// make sure it's an Element
const root = this._obj.get(0);
// make sure it's an Element
new _chai.Assertion(
root.nodeType,
`Expected an Element but got '${String(root)}'`
).to.equal(1);

const id = root.id;
cy.focused({ log: false }).then(($focused) => {
this.assert(
$focused.attr("aria-activedescendant") === id,
"expected #{this} to be #{exp}",
"expected #{this} not to be #{exp}",
"active descendant"
);
});
}

_chai.Assertion.addMethod("activeDescendant", assertIsActiveDescendant);
};

// registers our assertion function "isFocused" with Chai
chai.use(isActiveDescendant);

export {};
14 changes: 8 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"ag-grid-enterprise": "^30.2.0",
"ag-grid-react": "^30.2.0",
"axe-core": "^4.8.2",
"chromatic": "^10.0.0",
"chromatic": "^10.2.0",
"ci-info": "^3.3.1",
"clsx": "^2.0.0",
"cypress": "^13.0.0",
Expand All @@ -109,22 +109,24 @@
"rifm": "^0.12.0",
"sass": "^1.52.3",
"storybook": "7.4.6",
"stylelint": "^15.0.0",
"stylelint": "^16.0.0",
"typescript": "4.6.4",
"vite": "^4.4.9",
"vite-plugin-istanbul": "^5.0.0",
"vite-tsconfig-paths": "^4.2.0",
"vitest": "^1.0.0",
"webpack": "5.74.0",
"webpack": "5.76.0",
"yup": "^1.0.2"
},
"resolutions": {
"webpack-dev-server": "4.9.3",
"@changesets/assemble-release-plan@^5.2.2": "patch:@changesets/assemble-release-plan@npm%3A5.2.2#./.yarn/patches/@changesets-assemble-release-plan-npm-5.2.2-11f5894b70.patch",
"modular-scripts/rollup": "2.79.1",
"@next/eslint-plugin-next": "^14.0.0",
"@salt-ds/lab": "workspace:*",
"modular-scripts/rollup": "2.79.1",
"next": "^14.0.0",
"@next/eslint-plugin-next": "^14.0.0"
"webpack-dev-server": "4.9.3",
"webpack": "5.76.0",
"recursive-readdir": "2.2.3"
},
"browserslist": {
"production": [
Expand Down
7 changes: 7 additions & 0 deletions packages/core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @salt-ds/core

## 1.13.3

### Patch Changes

- f7fcbd11: Fixed issue where components are not injecting their styles.
- bb250947: Fixed `Badge` appearing over `Dialogs` due to an incorrect z-index.

## 1.13.2

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@salt-ds/core",
"version": "1.13.2",
"version": "1.13.3",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand All @@ -11,7 +11,7 @@
"main": "src/index.ts",
"sideEffects": false,
"dependencies": {
"@floating-ui/react": "^0.23.0",
"@floating-ui/react": "^0.26.5",
"clsx": "^2.0.0"
},
"peerDependencies": {
Expand Down
Loading
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.