Revert "[PBNTR-479] Expose margin bottom on Text Input within Typeahe…

…ad" (#3676) Reverts #3654
powerhome · Sep 9, 2024 · f31bf17 · f31bf17
1 parent 328fc93
commit f31bf17
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 208 deletions.
diff --git a/playbook/app/pb_kits/playbook/pb_radio/docs/_radio_children.jsx b/playbook/app/pb_kits/playbook/pb_radio/docs/_radio_children.jsx
@@ -18,32 +18,29 @@ const RadioChildren = (props) => {
     <div>
       <Radio
           label="Select"
-          marginBottom="sm"
           name="Group1"
           tabIndex={0}
           value="Select"
           {...props}
       >
         <Select 
-            marginBottom="none"
             minWidth="xs"
             options={options}
         />
       </Radio>
       <Radio
           label="Typeahead"
-          marginBottom="sm"
           name="Group1"
           tabIndex={0}
           value="Typeahead"
           {...props}
       >
         <Typeahead 
-            marginBottom="none"
             minWidth="xs"
             options={options}
         />
       </Radio>
+      <br />
       <Radio
           defaultChecked={false}
           label="Typography"

diff --git a/playbook/app/pb_kits/playbook/pb_text_input/_text_input.scss b/playbook/app/pb_kits/playbook/pb_text_input/_text_input.scss
@@ -45,6 +45,7 @@
       }
     }
     .text_input_wrapper {
+      margin-bottom: 1rem;
       input::placeholder,
       .text_input .placeholder {
         @include pb_body_light_dark;

diff --git a/playbook/app/pb_kits/playbook/pb_typeahead/_typeahead.test.jsx b/playbook/app/pb_kits/playbook/pb_typeahead/_typeahead.test.jsx
@@ -107,17 +107,4 @@ test('should pass className prop', () => {
 
   const kit = screen.getByTestId('typeahead-test')
   expect(kit).toHaveClass(className)
-})
-
-test('typeahead textinput has mb_sm class by default', () => {
-  render(
-    <Typeahead
-        data={{ testid: 'default-mb-test' }}
-        options={options} 
-    />
-  )
-
-  const kit = screen.getByTestId('default-mb-test')
-  const textInput = kit.querySelector(".pb_text_input_kit")
-  expect(textInput).toHaveClass("mb_sm")
 })
diff --git a/playbook/app/pb_kits/playbook/pb_typeahead/_typeahead.tsx b/playbook/app/pb_kits/playbook/pb_typeahead/_typeahead.tsx
@@ -45,7 +45,6 @@ type TypeaheadProps = {
   getOptionLabel?: string | (() => any),
   getOptionValue?: string | (() => any),
   name?: string,
-  marginBottom?: "none" | "xxs" | "xs" | "sm" | "md" | "lg" | "xl",
 } & GlobalProps
 
 export type SelectValueType = {
@@ -77,18 +76,12 @@ const Typeahead = ({
   htmlOptions = {},
   id,
   loadOptions = noop,
-  marginBottom = "sm",
   ...props
 }: TypeaheadProps) => {
   const selectProps = {
     cacheOptions: true,
     components: {
-      Control: (controlProps: any) => (
-        <Control 
-            {...controlProps} 
-            marginBottom={marginBottom} 
-        />
-      ),
+      Control,
       ClearIndicator,
       IndicatorsContainer,
       IndicatorSeparator: null as null,

diff --git a/playbook/app/pb_kits/playbook/pb_typeahead/components/Control.tsx b/playbook/app/pb_kits/playbook/pb_typeahead/components/Control.tsx
@@ -6,30 +6,23 @@ import TextInput from '../../pb_text_input/_text_input'
 
 type Props = {
   selectProps: any,
-  marginBottom?: string,
 }
 
-const TypeaheadControl = (props: Props) => {
-  const { selectProps, marginBottom } = props
-  const { dark, error, label } = selectProps
-
-  return (
-    <div className="pb_typeahead_wrapper">
-      <TextInput
-          dark={dark}
-          error={error}
-          label={label}
-          marginBottom={marginBottom}
-      >
-        <Flex>
-          <components.Control
-              className="text_input"
-              {...props}
-          />
-        </Flex>
-      </TextInput>
-    </div>
-  )
-}
+const TypeaheadControl = (props: Props) => (
+  <div className="pb_typeahead_wrapper">
+    <TextInput
+      dark={props.selectProps.dark}
+      error={props.selectProps.error}
+      label={props.selectProps.label}
+    >
+      <Flex>
+        <components.Control
+          className="text_input"
+          {...props}
+        />
+      </Flex>
+    </TextInput>
+  </div>
+)
 
 export default TypeaheadControl
diff --git a/playbook/app/pb_kits/playbook/pb_typeahead/docs/_typeahead_margin_bottom.html.erb b/playbook/app/pb_kits/playbook/pb_typeahead/docs/_typeahead_margin_bottom.html.erb
diff --git a/playbook/app/pb_kits/playbook/pb_typeahead/docs/_typeahead_margin_bottom.jsx b/playbook/app/pb_kits/playbook/pb_typeahead/docs/_typeahead_margin_bottom.jsx
diff --git a/playbook/app/pb_kits/playbook/pb_typeahead/docs/example.yml b/playbook/app/pb_kits/playbook/pb_typeahead/docs/example.yml
@@ -9,7 +9,6 @@ examples:
     - typeahead_inline: Inline
     - typeahead_multi_kit: Multi Kit Options
     - typeahead_error_state: Error State
-    - typeahead_margin_bottom: Margin Bottom
 
   react:
     - typeahead_default: Default
@@ -24,4 +23,3 @@ examples:
     - typeahead_async_createable: Createable (+ Async Data)
     - typeahead_error_state: Error State
     - typeahead_custom_menu_list: Custom MenuList
-    - typeahead_margin_bottom: Margin Bottom
diff --git a/playbook/app/pb_kits/playbook/pb_typeahead/docs/index.js b/playbook/app/pb_kits/playbook/pb_typeahead/docs/index.js
@@ -10,4 +10,3 @@ export { default as TypeaheadCreateable } from './_typeahead_createable.jsx'
 export { default as TypeaheadAsyncCreateable } from './_typeahead_async_createable.jsx'
 export { default as TypeaheadErrorState } from './_typeahead_error_state.jsx'
 export { default as TypeaheadCustomMenuList } from './_typeahead_custom_menu_list.jsx'
-export { default as TypeaheadMarginBottom } from './_typeahead_margin_bottom.jsx'
diff --git a/playbook/app/pb_kits/playbook/pb_typeahead/typeahead.html.erb b/playbook/app/pb_kits/playbook/pb_typeahead/typeahead.html.erb
@@ -20,8 +20,7 @@
         label: object.label,
         name: object.name,
         value: object.value,
-        placeholder: object.placeholder,
-        margin_bottom: "none",
+        placeholder: object.placeholder
       }) %>
       <%= pb_rails("list", props: { ordered: false, borderless: false, xpadding: true, role: "status", aria: { live: "polite" }, data: { pb_typeahead_kit_results: true } }) do %>
       <% end %>

diff --git a/playbook/app/pb_kits/playbook/pb_typeahead/typeahead.rb b/playbook/app/pb_kits/playbook/pb_typeahead/typeahead.rb
@@ -14,9 +14,6 @@ class Typeahead < Playbook::KitBase
                     default: false
       prop :label
       prop :load_options
-      prop :margin_bottom, type: Playbook::Props::Enum,
-                           values: %w[none xxs xs sm md lg xl],
-                           default: "sm"
       prop :multi_kit, type: Playbook::Props::String,
                        default: ""
       prop :name
@@ -39,8 +36,7 @@ class Typeahead < Playbook::KitBase
       prop :value
 
       def classname
-        default_margin_bottom = margin_bottom.present? ? "" : " mb_sm"
-        generate_classname("pb_typeahead_kit") + default_margin_bottom
+        generate_classname("pb_typeahead_kit")
       end
 
       def inline_class
@@ -69,7 +65,6 @@ def typeahead_react_options
           inline: inline,
           isMulti: is_multi,
           label: label,
-          marginBottom: margin_bottom,
           multiKit: multi_kit,
           name: name,
           options: options,

diff --git a/playbook/spec/pb_kits/playbook/kits/typeahead_spec.rb b/playbook/spec/pb_kits/playbook/kits/typeahead_spec.rb
@@ -32,7 +32,7 @@
 
   describe "#classname" do
     it "returns namespaced class name", :aggregate_failures do
-      expect(subject.new({}).classname).to eq "pb_typeahead_kit mb_sm"
+      expect(subject.new({}).classname).to eq "pb_typeahead_kit"
     end
   end
 end