From 80c070e50cc3abe014efee6a7ba32cb510e1366b Mon Sep 17 00:00:00 2001 From: tiahan Date: Thu, 24 Oct 2024 16:33:22 +0800 Subject: [PATCH] feat(combobox): resolve conflict --- .../ComboBox/ComboBox.unit.test.tsx.snap | 2759 +++++++++++++++++ .../ListItemBase/ListItemBase.style.scss | 2 +- .../TextInput/TextInput.unit.test.tsx.snap | 37 + 3 files changed, 2797 insertions(+), 1 deletion(-) diff --git a/src/components/ComboBox/ComboBox.unit.test.tsx.snap b/src/components/ComboBox/ComboBox.unit.test.tsx.snap index e69de29bb2..7260356192 100644 --- a/src/components/ComboBox/ComboBox.unit.test.tsx.snap +++ b/src/components/ComboBox/ComboBox.unit.test.tsx.snap @@ -0,0 +1,2759 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`ComboBox snapshot should match snapshot label 1`] = ` + +
+ + + + + + + + } + > + + + + + + + + + + + + + + + +
+ } + /> + + + + + +
+`; + +exports[`ComboBox snapshot should match snapshot with className 1`] = ` + +
+ + + + + + + } + > + + + + + + + + + + + + + + + +
+ } + /> + + + + + +
+`; + +exports[`ComboBox snapshot should match snapshot with listboxWidth 1`] = ` + +
+ + + + + + + } + > + + + + + + + + + + + + + + + +
+ } + /> + + + + + +
+`; + +exports[`ComboBox snapshot should match snapshot with noResultLabel 1`] = ` + +
+ + + + + + + } + > + + + + + + + + + + + + + + + +
+ } + /> + + + + + +
+`; + +exports[`ComboBox snapshot should match snapshot with placeholder 1`] = ` + +
+ + + + + + + } + > + + + + + + + + + + + + + + + +
+ } + /> + + + + + +
+`; + +exports[`ComboBox snapshot should match snapshot with style 1`] = ` + +
+ + + + + + + } + > + + + + + + + + + + + + + + + +
+ } + /> + + + + + +
+`; + +exports[`ComboBox snapshot should match snapshot withSection 1`] = ` + +
+ + + + + + + } + > + + + + + + + + + + + + + + + +
+ } + /> + + + + + +
+`; diff --git a/src/components/ListItemBase/ListItemBase.style.scss b/src/components/ListItemBase/ListItemBase.style.scss index 0bf8c5a4cb..7c1b31dd0d 100644 --- a/src/components/ListItemBase/ListItemBase.style.scss +++ b/src/components/ListItemBase/ListItemBase.style.scss @@ -91,7 +91,7 @@ // trim any type of text inside p, span, - div { + div, .md-text-wrapper { overflow: hidden; text-overflow: ellipsis; diff --git a/src/components/TextInput/TextInput.unit.test.tsx.snap b/src/components/TextInput/TextInput.unit.test.tsx.snap index 4f8f87e221..ab5d528437 100644 --- a/src/components/TextInput/TextInput.unit.test.tsx.snap +++ b/src/components/TextInput/TextInput.unit.test.tsx.snap @@ -62,6 +62,43 @@ exports[` snapshot should match snapshot with className 1`] = ` `; exports[` snapshot should match snapshot with clearAriaLabel 1`] = ` + + +
+ +
+ +
+
+
+
+`; + +exports[` snapshot should match snapshot with clearAriaLabel 2`] = `