Merge branch 'main' into ebay-video-player-type

eBay · Oct 17, 2023 · 0d25701 · 0d25701
2 parents a549ac0 + a2b1845
commit 0d25701
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ebay/ui-core-react",
-  "version": "5.4.1",
+  "version": "5.4.2",
   "description": "Skin components build off React",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

diff --git a/src/ebay-listbox-button/__tests__/__snapshots__/index.spec.tsx.snap b/src/ebay-listbox-button/__tests__/__snapshots__/index.spec.tsx.snap
@@ -288,6 +288,11 @@ exports[`Storyshots ebay-listbox-button Floating label 1`] = `
       >
         Select
       </span>
+      <span
+        className="btn__text"
+      >
+        -
+      </span>
       <svg
         aria-hidden={true}
         className="icon icon--chevron-down-16"

diff --git a/src/ebay-listbox-button/listbox-button.tsx b/src/ebay-listbox-button/listbox-button.tsx
@@ -243,12 +243,10 @@ const ListboxButton: FC<EbayListboxButtonProps> = ({
     })
     const expandBtnTextId = prefixId && 'expand-btn-text'
 
-    const buttonLabel = floatingLabel ? (
-        <span className="btn__floating-label">
-            {floatingLabel}
-        </span>
-    ) : (
+
+    const buttonLabel = (
         <>
+            {floatingLabel && <span className="btn__floating-label">{floatingLabel}</span>}
             {prefixLabel && <span className="btn__label">{prefixLabel}</span>}
             <span className="btn__text" id={expandBtnTextId}>
                 {selectedOption?.props.children || unselectedText}
-Original file line number
+Diff line change
@@ Expand Up @@
           >
             Select
           </span>
+          <span
+            className="btn__text"
+          >
+            -
+          </span>
           <svg
             aria-hidden={true}
             className="icon icon--chevron-down-16"
@@ Expand Down @@