From 8936faa8c28f98a27555f11092fbdeb0873b8a00 Mon Sep 17 00:00:00 2001
From: Parthiv Krishnan <parkrish@redhat.com>
Date: Thu, 22 May 2025 16:28:24 -0400
Subject: [PATCH 1/5] fix: added resultsCountContext prop to pass into the
 screenReaderText prop

---
 package.json                                             | 3 +++
 .../src/components/SearchInput/SearchInput.tsx           | 9 ++++++++-
 yarn.lock                                                | 1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8a00c85d12b..80c39e069b5 100644
--- a/package.json
+++ b/package.json
@@ -120,5 +120,8 @@
       "packages/*",
       "packages/react-integration/demo-app-ts"
     ]
+  },
+  "dependencies": {
+    "@patternfly/react-core": "workspace:^"
   }
 }
diff --git a/packages/react-core/src/components/SearchInput/SearchInput.tsx b/packages/react-core/src/components/SearchInput/SearchInput.tsx
index 034ca70bd64..ce3b7f5e3f6 100644
--- a/packages/react-core/src/components/SearchInput/SearchInput.tsx
+++ b/packages/react-core/src/components/SearchInput/SearchInput.tsx
@@ -118,6 +118,8 @@ export interface SearchInputProps extends Omit<React.HTMLProps<HTMLDivElement>,
   /** The number of search results returned. Either a total number of results,
    * or a string representing the current result over the total number of results. i.e. "1 / 5". */
   resultsCount?: number | string;
+  /** A String that will appear after resultsCount to give context for what that value represents */
+  resultsCountContext?: string;
   /** Label for the button which calls the onSearch event handler. */
   submitSearchButtonLabel?: string;
   /** Value of the search input. */
@@ -144,6 +146,7 @@ const SearchInputBase: React.FunctionComponent<SearchInputProps> = ({
   onToggleAdvancedSearch,
   isAdvancedSearchOpen = false,
   resultsCount,
+  resultsCountContext = 'results',
   onNextClick,
   onPreviousClick,
   innerRef,
@@ -309,7 +312,11 @@ const SearchInputBase: React.FunctionComponent<SearchInputProps> = ({
       />
       {(renderUtilities || areUtilitiesDisplayed) && (
         <TextInputGroupUtilities>
-          {resultsCount && <Badge isRead>{resultsCount}</Badge>}
+          {resultsCount && (
+            <Badge isRead screenReaderText={resultsCountContext}>
+              {resultsCount} results
+            </Badge>
+          )}
           {!!onNextClick && !!onPreviousClick && (
             <div className={textInputGroupStyles.textInputGroupGroup}>
               <Button
diff --git a/yarn.lock b/yarn.lock
index 1b062979de6..10b02eeb01f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3831,6 +3831,7 @@ __metadata:
     "@eslint/compat": "npm:^1.2.8"
     "@eslint/js": "npm:^9.22.0"
     "@octokit/rest": "npm:^21.1.1"
+    "@patternfly/react-core": "workspace:^"
     "@rollup/plugin-commonjs": "npm:^26.0.3"
     "@rollup/plugin-node-resolve": "npm:^15.3.1"
     "@rollup/plugin-replace": "npm:^5.0.7"

From 744894f32f94e3cd97f6bbe69beac49221cf8469 Mon Sep 17 00:00:00 2001
From: Parthiv Krishnan <parkrish@redhat.com>
Date: Thu, 22 May 2025 16:45:48 -0400
Subject: [PATCH 2/5] fix: updated contributing markdown

---
 packages/react-core/CONTRIBUTING.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/react-core/CONTRIBUTING.md b/packages/react-core/CONTRIBUTING.md
index 8ce6f8e1bc3..ef8f625f0e7 100644
--- a/packages/react-core/CONTRIBUTING.md
+++ b/packages/react-core/CONTRIBUTING.md
@@ -79,17 +79,15 @@ $ yarn test
 
 Ensure no lint errors are introduced in `yarn-error.log` after running this command.
 
-5.  Add a commit using `yarn commit`:
+5.  Add a commit using `git commit`:
 
-This project uses [`lerna`](https://lernajs.io/) to do automatic releases and generate a changelog based on the commit history. So we follow [a convention][3] for commit messages. Please follow this convention for your commit messages.
-
-You can use `commitizen` to help you to follow [the convention][3].
+This project uses [`lerna`](https://lerna.js.io/) to do automatic releases and generate a changelog based on the commit history. So we follow [a convention][3] for commit messages. Please follow [`this convention`](https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#type) for your commit messages.
 
 Once you are ready to commit the changes, please use the below commands:
 
 ```text
 $ git add <files to be committed>
-$ yarn commit
+$ git commit -m
 ```
 
 ... and follow the instruction of the interactive prompt.

From a00c25b9bb030ce1e80cbe3f8f043fb8cf84ea6a Mon Sep 17 00:00:00 2001
From: Parthiv Krishnan <parkrish@redhat.com>
Date: Tue, 27 May 2025 13:23:27 -0400
Subject: [PATCH 3/5] fix: changed integration tests and fixed results
 duplication

---
 .../react-core/src/components/SearchInput/SearchInput.tsx   | 4 ++--
 .../cypress/integration/searchinput.spec.ts                 | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/react-core/src/components/SearchInput/SearchInput.tsx b/packages/react-core/src/components/SearchInput/SearchInput.tsx
index ce3b7f5e3f6..8413ad8fc58 100644
--- a/packages/react-core/src/components/SearchInput/SearchInput.tsx
+++ b/packages/react-core/src/components/SearchInput/SearchInput.tsx
@@ -146,7 +146,7 @@ const SearchInputBase: React.FunctionComponent<SearchInputProps> = ({
   onToggleAdvancedSearch,
   isAdvancedSearchOpen = false,
   resultsCount,
-  resultsCountContext = 'results',
+  resultsCountContext = ' results',
   onNextClick,
   onPreviousClick,
   innerRef,
@@ -314,7 +314,7 @@ const SearchInputBase: React.FunctionComponent<SearchInputProps> = ({
         <TextInputGroupUtilities>
           {resultsCount && (
             <Badge isRead screenReaderText={resultsCountContext}>
-              {resultsCount} results
+              {resultsCount}
             </Badge>
           )}
           {!!onNextClick && !!onPreviousClick && (
diff --git a/packages/react-integration/cypress/integration/searchinput.spec.ts b/packages/react-integration/cypress/integration/searchinput.spec.ts
index e4487cf6490..35fd35ecff4 100644
--- a/packages/react-integration/cypress/integration/searchinput.spec.ts
+++ b/packages/react-integration/cypress/integration/searchinput.spec.ts
@@ -36,11 +36,11 @@ describe('Search Input Demo Test', () => {
     cy.get('#enabled-search .pf-v6-c-text-input-group__utilities  > button').should('be.visible');
     cy.get('#enabled-search .pf-v6-c-text-input-group__group').should('be.visible');
 
-    cy.get('#enabled-search .pf-v6-c-badge').should('have.text', '1 / 3');
+    cy.get('#enabled-search .pf-v6-c-badge').should('have.text', '1 / 3results');
     cy.get('#enabled-search .pf-v6-c-text-input-group__group button').last().click();
-    cy.get('#enabled-search .pf-v6-c-badge').should('have.text', '2 / 3');
+    cy.get('#enabled-search .pf-v6-c-badge').should('have.text', '2 / 3results');
     cy.get('#enabled-search .pf-v6-c-text-input-group__group button').first().click();
-    cy.get('#enabled-search .pf-v6-c-badge').should('have.text', '1 / 3');
+    cy.get('#enabled-search .pf-v6-c-badge').should('have.text', '1 / 3results');
 
     cy.get('#enabled-search .pf-v6-c-text-input-group__utilities  > button').click();
     cy.get('#enabled-search .pf-v6-c-text-input-group__text-input').should('not.have.value', 'Hello world');

From 0f12b96f71e2d57825f8ebb99f1de6cc7f27b38f Mon Sep 17 00:00:00 2001
From: Parthiv Krishnan <parkrish@redhat.com>
Date: Tue, 27 May 2025 13:44:15 -0400
Subject: [PATCH 4/5] fix: removed unnecessary dependencies and modified
 integration tests

---
 package.json                                                | 3 ---
 .../cypress/integration/searchinput.spec.ts                 | 6 +++---
 yarn.lock                                                   | 1 -
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 80c39e069b5..8a00c85d12b 100644
--- a/package.json
+++ b/package.json
@@ -120,8 +120,5 @@
       "packages/*",
       "packages/react-integration/demo-app-ts"
     ]
-  },
-  "dependencies": {
-    "@patternfly/react-core": "workspace:^"
   }
 }
diff --git a/packages/react-integration/cypress/integration/searchinput.spec.ts b/packages/react-integration/cypress/integration/searchinput.spec.ts
index 35fd35ecff4..d522616efcf 100644
--- a/packages/react-integration/cypress/integration/searchinput.spec.ts
+++ b/packages/react-integration/cypress/integration/searchinput.spec.ts
@@ -36,11 +36,11 @@ describe('Search Input Demo Test', () => {
     cy.get('#enabled-search .pf-v6-c-text-input-group__utilities  > button').should('be.visible');
     cy.get('#enabled-search .pf-v6-c-text-input-group__group').should('be.visible');
 
-    cy.get('#enabled-search .pf-v6-c-badge').should('have.text', '1 / 3results');
+    cy.get('#enabled-search .pf-v6-c-badge').should('have.text', '1 / 3 results');
     cy.get('#enabled-search .pf-v6-c-text-input-group__group button').last().click();
-    cy.get('#enabled-search .pf-v6-c-badge').should('have.text', '2 / 3results');
+    cy.get('#enabled-search .pf-v6-c-badge').should('have.text', '2 / 3 results');
     cy.get('#enabled-search .pf-v6-c-text-input-group__group button').first().click();
-    cy.get('#enabled-search .pf-v6-c-badge').should('have.text', '1 / 3results');
+    cy.get('#enabled-search .pf-v6-c-badge').should('have.text', '1 / 3 results');
 
     cy.get('#enabled-search .pf-v6-c-text-input-group__utilities  > button').click();
     cy.get('#enabled-search .pf-v6-c-text-input-group__text-input').should('not.have.value', 'Hello world');
diff --git a/yarn.lock b/yarn.lock
index 10b02eeb01f..1b062979de6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3831,7 +3831,6 @@ __metadata:
     "@eslint/compat": "npm:^1.2.8"
     "@eslint/js": "npm:^9.22.0"
     "@octokit/rest": "npm:^21.1.1"
-    "@patternfly/react-core": "workspace:^"
     "@rollup/plugin-commonjs": "npm:^26.0.3"
     "@rollup/plugin-node-resolve": "npm:^15.3.1"
     "@rollup/plugin-replace": "npm:^5.0.7"

From 71eaf7e39261d56b34d9d542a28e6627102b9e05 Mon Sep 17 00:00:00 2001
From: parthivrh <parkrish@redhat.com>
Date: Thu, 29 May 2025 14:35:37 -0400
Subject: [PATCH 5/5] Update
 packages/react-core/src/components/SearchInput/SearchInput.tsx

Co-authored-by: Eric Olkowski <70952936+thatblindgeye@users.noreply.github.com>
---
 packages/react-core/src/components/SearchInput/SearchInput.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-core/src/components/SearchInput/SearchInput.tsx b/packages/react-core/src/components/SearchInput/SearchInput.tsx
index 8413ad8fc58..8ebd348bf03 100644
--- a/packages/react-core/src/components/SearchInput/SearchInput.tsx
+++ b/packages/react-core/src/components/SearchInput/SearchInput.tsx
@@ -118,7 +118,7 @@ export interface SearchInputProps extends Omit<React.HTMLProps<HTMLDivElement>,
   /** The number of search results returned. Either a total number of results,
    * or a string representing the current result over the total number of results. i.e. "1 / 5". */
   resultsCount?: number | string;
-  /** A String that will appear after resultsCount to give context for what that value represents */
+  /** Screenreader text that will appear after resultsCount to give context for what that value represents to assistive technologies. */
   resultsCountContext?: string;
   /** Label for the button which calls the onSearch event handler. */
   submitSearchButtonLabel?: string;