Skip to content

Commit d38e9f2

Browse files
tlabajthatblindgeyepatternfly-buildTitaniandyyvo
committed
Chore: Rebase v5 (patternfly#8227)
* fix(Menu): fixed height issue with drilldown examples (patternfly#8033) * chore(release): releasing packages [ci skip] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - [email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] * chore(docs): Release notes 2022.13 (patternfly#8168) * chore(docs): Release notes 2022.13 * release note updates * add screnshots and versions * update note * updates from comments Co-authored-by: Titani <[email protected]> * chore(release): releasing packages [ci skip] - @patternfly/[email protected] * chore(docs): Updated release notes (patternfly#8202) Co-authored-by: Titani <[email protected]> * chore(release): releasing packages [ci skip] - @patternfly/[email protected] * chore(Sidebar): converted examples to typescript (patternfly#8062) * chore(Banner): update tests to new react testing library standards (patternfly#8160) * chore(Banner): update tests to new react testing library standards * add additional test to test screenReaderText * replace toHaveTextContent with toBeInTheDocument matcher * add test to check for pf-u-screen-reader class * specify est timezone for jest to run with (patternfly#8151) * chore(release): releasing packages [ci skip] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - [email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] * feature(Select): flag to put create option at top of typeahead (patternfly#8165) * chore(release): releasing packages [ci skip] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - [email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] * fix(Dropdown next): Add support for forward ref and updated docs. (patternfly#8142) * fix(Dropdown next): Add support for forward ref and updated docs. * hide inner ref prop * hide innerRef Co-authored-by: Titani <[email protected]> * chore(release): releasing packages [ci skip] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - [email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] * chore(Title): update tests to new RTL standards (patternfly#8156) * chore(Title): update tests to new RTL standards * chore(Title): update tests to new RTL standards * chore(Title): update tests to new RTL standards Co-authored-by: Drew Amunategui II <[email protected]> Co-authored-by: Drew Amunategui II <[email protected]> * chore(release): releasing packages [ci skip] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - [email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] * docs(Empty state): Added EmptyStatePrimary to documentation (patternfly#8161) * docs(Empty state): Added EmptyStatePrimary to documentation * fix typo Co-authored-by: Titani <[email protected]> * chore(release): releasing packages [ci skip] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - [email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] * fix(Slider): correct tab order when input is above thumb (patternfly#8190) * chore(deps): update dependency @patternfly/documentation-framework to v1.2.43 (patternfly#8129) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(release): releasing packages [ci skip] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - [email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] * feat(label+labelGroup): update aria-labels to include label text (patternfly#8192) * feat(label+labelGroup): update aria-labels to include editable label text * PR feedback from Eric * chore(release): releasing packages [ci skip] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - [email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] * chore(deps): update dependency @patternfly/documentation-framework to v1.2.44 (patternfly#8225) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(SkipToContent): converted examples to typescript (patternfly#8138) * chore(SkipToContent): converted examples to typescript * fix(SkipToContent): added trailing newline for linter * chore(TextInput): converted examples to typescript (patternfly#8137) * chore(TextInput): converted examples to typescript * fix(TextInput): removed problematic file * fix(TextInput): added file back with correct name * fix(TextInput): fixed requested changes * chore(release): releasing packages [ci skip] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - [email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] - @patternfly/[email protected] * feat(simple list): removed deprecated prop (patternfly#8132) * chore: remove keycodes definition (patternfly#8174) * chore(FileUpload): remove deprecated onChange prop (patternfly#8155) * chore(Spinner): updated isSVG prop default value (patternfly#8183) * chore(Spinner): updated isSVG prop default value * updated prop in example to meet a11y requirements * updated react-console snapshots * chore(pagination): rename `ToggleTemplateProps` to `PaginationToggleTemplateProps` in pagination component (patternfly#8134) * feat(button): combine isSmall and isLarge into customSize (patternfly#8144) * button - combine isSmall and isLarge into customSize * use enum * use size for button prop name * fixing import * use default vs md * reorder enum * reorder prop values, new verbiage for prop description * fix(Page): updated onPageResize prop to undefined default (patternfly#8203) * chore(Divider): remove isVertical prop (patternfly#8199) * chore(Card): removed isHoverable prop (patternfly#8196) * chore(card): remove isHoverable * update card snapshot * chore(Page) remove deprecated props (patternfly#8220) * chore(Page) remove deprecated props * update tests * update docs and integration tests * fix snapshots, remove isManagedSidebar prop * feat(Toolbar): remove depricated visiblity (patternfly#8212) * chore(Dropdown): remove deprecated props (patternfly#8179) * chore(Dropdown): remove deprecated props * chore(Dropdown): cleaning up lint comment * fix(ClipboardCopy): remove popoverposition (patternfly#8226) * fix(ClipboardCopy): remove popoverposition * edit doc comment * remove popover type from clipboardcopybutton Co-authored-by: Eric Olkowski <[email protected]> Co-authored-by: patternfly-build <[email protected]> Co-authored-by: Titani <[email protected]> Co-authored-by: Andy Vo <[email protected]> Co-authored-by: Samuel Atefah <[email protected]> Co-authored-by: Dallas <[email protected]> Co-authored-by: drewamunat2 <[email protected]> Co-authored-by: Drew Amunategui II <[email protected]> Co-authored-by: Drew Amunategui II <[email protected]> Co-authored-by: Tomas Psota <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jenny <[email protected]> Co-authored-by: kev-kim <[email protected]> Co-authored-by: Gustavo Santos <[email protected]> Co-authored-by: Austin Sullivan <[email protected]> Co-authored-by: Shakirul Hasan <[email protected]> Co-authored-by: Dominik Petřík <[email protected]>
1 parent 90c3acc commit d38e9f2

File tree

4 files changed

+22
-14
lines changed

4 files changed

+22
-14
lines changed

‎packages/react-catalog-view-extension/package.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@patternfly/react-catalog-view-extension",
3+
<<<<<<< HEAD
34
"version": "4.92.55",
5+
=======
6+
"version": "4.92.35",
7+
>>>>>>> f94191928 (Chore: Rebase v5 (#8227))
48
"description": "This library provides catalog view extensions for PatternFly 4 React.",
59
"main": "dist/js/index.js",
610
"module": "dist/esm/index.js",

‎packages/react-core/src/components/Slider/Slider.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -416,16 +416,16 @@ export const Slider: React.FunctionComponent<SliderProps> = ({
416416
{buildSteps()}
417417
</div>
418418
)}
419+
{isInputVisible && inputPosition === 'aboveThumb' && (
420+
<div className={css(styles.sliderValue, styles.modifiers.floating)}>{displayInput()}</div>
421+
)}
419422
{hasTooltipOverThumb ? (
420423
<Tooltip entryDelay={0} content={findAriaTextValue()}>
421424
{thumbComponent}
422425
</Tooltip>
423426
) : (
424427
thumbComponent
425428
)}
426-
{isInputVisible && inputPosition === 'aboveThumb' && (
427-
<div className={css(styles.sliderValue, styles.modifiers.floating)}>{displayInput()}</div>
428-
)}
429429
</div>
430430
{isInputVisible && inputPosition === 'right' && <div className={css(styles.sliderValue)}>{displayInput()}</div>}
431431
{rightActions && <div className={css(styles.sliderActions)}>{rightActions}</div>}

‎packages/react-core/src/components/Slider/_tests_/__snapshots__/Slider.test.tsx.snap‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -475,17 +475,6 @@ exports[`slider renders slider with input above thumb 1`] = `
475475
</div>
476476
</div>
477477
</div>
478-
<div
479-
aria-disabled="false"
480-
aria-label="Value"
481-
aria-valuemax="100"
482-
aria-valuemin="0"
483-
aria-valuenow="50"
484-
aria-valuetext="50"
485-
class="pf-c-slider__thumb"
486-
role="slider"
487-
tabindex="0"
488-
/>
489478
<div
490479
class="pf-c-slider__value pf-m-floating"
491480
>
@@ -509,6 +498,17 @@ exports[`slider renders slider with input above thumb 1`] = `
509498
</span>
510499
</div>
511500
</div>
501+
<div
502+
aria-disabled="false"
503+
aria-label="Value"
504+
aria-valuemax="100"
505+
aria-valuemin="0"
506+
aria-valuenow="50"
507+
aria-valuetext="50"
508+
class="pf-c-slider__thumb"
509+
role="slider"
510+
tabindex="0"
511+
/>
512512
</div>
513513
</div>
514514
</DocumentFragment>

‎packages/react-virtualized-extension/package.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@patternfly/react-virtualized-extension",
3+
<<<<<<< HEAD
34
"version": "4.88.55",
5+
=======
6+
"version": "4.88.35",
7+
>>>>>>> f94191928 (Chore: Rebase v5 (#8227))
48
"description": "This library provides efficient rendering extensions for PatternFly 4 React tables and lists.",
59
"main": "dist/js/index.js",
610
"module": "dist/esm/index.js",

0 commit comments

Comments
 (0)