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

chore(rebase): Merge main onto v6 branch #10260

Closed
wants to merge 189 commits into from
Closed

chore(rebase): Merge main onto v6 branch #10260

wants to merge 189 commits into from

Conversation

tlabaj
Copy link
Contributor

@tlabaj tlabaj commented Apr 9, 2024

What: Closes #10261

mcoker and others added 30 commits November 2, 2023 09:49
* fix(Text input): Added aria-expanded

* add interface

* updates from review
…rawer item read state (patternfly#9569)

* fix(Notification Drawer): Added screen reader text for notification drawer item read state

* fix snapshot

* Update prop description

* add aria-live

* update snapshots
…y#9709)

* feat: ability to add props to WizardFooter buttons

* fix(WizardFooter): null check

* fix(Wizard): simpler design of adding footer buttons props

* test(Wizard): can add props to footer buttons

* docs(WizardFooter): move comment so docs have correct description

* refactor(WizardFooter): move FooterButtonProps to types file
* chore(Divider): update tests to new standards

* changes from PR review
…es (patternfly#9347)

* bug(build): fixed built ESM files importing CJS files from react-styles

* edited yarn.lock to invalidate deps cache in GH actions

* excluded file extensions from react-styles path transform in ESM build

* updated jest config to transform .mjs files

* updated pr action to invalidate deps cache if package files added/edited

* chore(deps): Add ts-node to support executing typescript files directly
…lease.4 (patternfly#9780)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…ly#9048 (patternfly#9087)

* feat(Datalist): implement full page Basic demo to match HTML patternfly#9048

* fix syntax error

* comments applied

* comments applied

* comments applied

* comments applied

* \xa0 comments applied

* move key per review comments

* address PR comments

* revert change to package.json

* Converted basic demo to TS

---------

Co-authored-by: nicolethoen <[email protected]>
Co-authored-by: Eric Olkowski <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…lease.5 (patternfly#9806)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* clean up instances of Array.apply

* rename item to value
* add spread prop test, update test

* chore(DataList): update tests

* fix merge error

* break out into separate files, pr feedback

* updates

* fix some example ids

* minor test updates

* revert action change
* bug(ClipboardCopy): change children type to string

Signed-off-by: gitdallas <[email protected]>

* fix clipboardcopyexpanded to work with string children

Signed-off-by: gitdallas <[email protected]>

* refactor a bit

* fix bad rebase

---------

Signed-off-by: gitdallas <[email protected]>
patternfly-build and others added 20 commits March 27, 2024 13:59
* feat(templates): add templates package

* revert v6 merge change from previous branch loc

* update template location to tab

* update ver after rebase

* add descriptions to simple select

* pr feedback

* fix merge

* update docs-framework and code-editor

* fix jest mocks

* back out codeeditor changes

* update templates version

* update templates version

* pr updates

* yarn lockfile

* update options type

* Revert "yarn lockfile"

This reverts commit 6839ce2.

* lockfile revert

* update ver

* update type

* doc build try 1
* feat(MenuToggle/Select): add status

* pr feedback

* update menutoggle example

* update example desc

* mark prop as beta
…10202)

* fix(Card): updated v5 logic to prevent unclickable cards

* Updated API to have isSelected control selectable card state

* Updated cypress test

* Updated cypress test

* Updated cypress test
* covert RTL demo to TS

* update component type jsx to tsx

* update type js to ts

* fix doc build job

* implement review comments

* fix types
…ternfly#10159)

* feat(Select): add checkbox variant of the simple select template

* chore(Select): rename template

* fix(Select): mock generated id in CheckboxSelect snapshot tests
* refactor(Label): rename button to closeButton

* feat(Label): allow clickable labels to be disabled

* docs(Label): add examples of clickable disabled

* refactor(Label): use style token for pf-m-disabled

* Prevented anchor onClick firing for AT

---------

Co-authored-by: Eric Olkowski <[email protected]>
@tlabaj tlabaj changed the title chore(rebase): Mege main onto v6 branch chore(rebase): Merge main onto v6 branch Apr 9, 2024
@patternfly-build
Copy link
Contributor

patternfly-build commented Apr 9, 2024

Copy link
Contributor

@thatblindgeye thatblindgeye left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My changes look good, just have a question below for Nolting.

Comment on lines +155 to 160
{/* TODO: Remove the following Tr once Core updates towards https://github.com/patternfly/patternfly/issues/6272
are made for the v5 branch. For v6 branch the row can be removed immediately.
*/}
<Tr isBorderRow aria-hidden="true">
<Td colSpan={9}></Td>
</Tr>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mattnolting can this Tr still be removed safely for v6? Context is the nested sticky header example

Copy link
Contributor

@kmcfaul kmcfaul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a couple minor things I noticed, otherwise looks good once the build passes.

@@ -574,7 +574,7 @@ export const PrimaryDetailCardView: React.FunctionComponent = () => {
</FlexItem>
<FlexItem>
<TextContent>
<Text component="small" className="pf-v6-u-color-200 pf-v6-u-font-family-text">
<Text component="small" className="pf-v5-u-color-200 pf-v5-u-font-family-text">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this still be v6?

@@ -152,6 +152,9 @@ export const TableNestedHeaders: React.FunctionComponent = () => {
{columnNames.destination}
</Th>
</Tr>
{/* TODO: Remove the following Tr once Core updates towards https://github.com/patternfly/patternfly/issues/6272
are made for the v5 branch. For v6 branch the row can be removed immediately.
*/}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this can be done now for v6 or in a follow up to get the merge PR in.

@tlabaj tlabaj closed this Apr 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.