RubyGems - playbook_ui - Versions diffs - 13.25.0.pre.alpha.barchartfix2766 → 13.26.0.pre.alpha.PBNTR291Dropdownrailsv22840 - Mend

playbook_ui 13.25.0.pre.alpha.barchartfix2766 → 13.26.0.pre.alpha.PBNTR291Dropdownrailsv22840

Files changed (223) hide show

data/app/pb_kits/playbook/pb_dropdown/subcomponents/DropdownContainer.tsx CHANGED Viewed

@@ -17,8 +17,9 @@ import Body from "../../pb_body/_body";
 type DropdownContainerProps = {
   aria?: { [key: string]: string };
-  className?: string;
   children?: React.ReactChild[] | React.ReactChild;
+  className?: string;
+  dark?: boolean;
   data?: { [key: string]: string };
   htmlOptions?: {[key: string]: string | number | boolean | (() => void)},
   id?: string;
@@ -28,8 +29,9 @@ type DropdownContainerProps = {
 const DropdownContainer = (props: DropdownContainerProps) => {
   const {
     aria = {},
-    className,
     children,
+    className,
+    dark = false,
     data = {},
     htmlOptions = {},
     id,
@@ -37,12 +39,14 @@ const DropdownContainer = (props: DropdownContainerProps) => {
   } = props;
   const {
-    isDropDownClosed,
-    handleChange,
-    filterItem,
+    dropdownContainerRef,
     filteredOptions,
+    filterItem,
+    handleChange,
     inputRef,
+    isDropDownClosed,
     setFocusedOptionIndex,
+    triggerRef
   } = useContext(DropdownContext);
   const ariaProps = buildAriaProps(aria);
@@ -62,9 +66,12 @@ const DropdownContainer = (props: DropdownContainerProps) => {
         className={classes}
         id={id}
         onMouseEnter={() => setFocusedOptionIndex(-1)}
+        ref={dropdownContainerRef}
+        style={triggerRef ? {} : { position: "absolute"}}
     >
       {searchbar && (
-        <TextInput paddingTop="xs"
+        <TextInput dark={dark}
+            paddingTop="xs"
             paddingX="xs"
         >
             <input
@@ -75,9 +82,10 @@ const DropdownContainer = (props: DropdownContainerProps) => {
             />
         </TextInput>
       )}
-      <List>{
+      <List dark={dark}>
+        {
         filteredOptions?.length === 0 ? (
-          <ListItem
+          <ListItem dark={dark}
               display="flex"
               // eslint-disable-next-line @typescript-eslint/ban-ts-comment
               // @ts-ignore
@@ -85,6 +93,7 @@ const DropdownContainer = (props: DropdownContainerProps) => {
               padding="xs"
           >
             <Body color="light"
+                dark={dark}
                 text="no option"
             />
           </ListItem>

data/app/pb_kits/playbook/pb_dropdown/subcomponents/DropdownOption.tsx CHANGED Viewed

@@ -17,39 +17,43 @@ import { GenericObject } from "../../types";
 type DropdownOptionProps = {
   aria?: { [key: string]: string };
-  className?: string;
   children?: React.ReactChild[] | React.ReactChild;
+  className?: string;
+  dark?: boolean;
   data?: { [key: string]: string };
   htmlOptions?: { [key: string]: string | number | boolean | (() => void) };
   id?: string;
-  option?: GenericObject;
   key?: string;
+  option?: GenericObject;
   padding?: string;
 }  & GlobalProps;
 const DropdownOption = (props: DropdownOptionProps) => {
   const {
     aria = {},
-    className,
     children,
+    className,
+    dark = false,
     data = {},
     htmlOptions = {},
     id,
-    option,
     key,
+    option,
     padding = "xs",
   } = props;
   const {
-    handleOptionClick,
-    selected,
-    filterItem,
     filteredOptions,
+    filterItem,
     focusedOptionIndex,
+    handleOptionClick,
+    selected,
   } = useContext(DropdownContext);
-  const isItemMatchingFilter = (option: GenericObject) =>
-    option?.label.toLowerCase().includes(filterItem.toLowerCase());
+  const isItemMatchingFilter = (option: GenericObject) => {
+    const label = typeof option.label === 'string' ? option.label.toLowerCase() : option.label;
+    return String(label).toLowerCase().includes(filterItem.toLowerCase());
+  }
   if (!isItemMatchingFilter(option)) {
     return null;
@@ -57,20 +61,22 @@ const DropdownOption = (props: DropdownOptionProps) => {
   const isFocused =
     focusedOptionIndex >= 0 &&
     filteredOptions[focusedOptionIndex].label === option.label;
-  const focusedClass = isFocused && "dropdown_option_focused";
+  const focusedClass = isFocused && "focused";
   const selectedClass = `${
     selected.label === option.label
-      ? "dropdown_option_selected"
-      : "dropdown_option_list"
+      ? "selected"
+      : "list"
   }`;
   const ariaProps = buildAriaProps(aria);
   const dataProps = buildDataProps(data);
   const htmlProps = buildHtmlProps(htmlOptions);
   const classes = classnames(
-    buildCss("pb_dropdown_option"),
-    selectedClass,
-    focusedClass,
+    buildCss(
+      "pb_dropdown_option",
+      selectedClass,
+      focusedClass,
+    ),
     globalProps(props, {padding}),
     className
   );
@@ -87,18 +93,24 @@ const DropdownOption = (props: DropdownOptionProps) => {
     >
       <ListItem
           cursor="pointer"
+          dark={dark}
           data-name={option.value}
           key={option.label}
           padding="none"
       >
         <Flex
             align="center"
-            className="dropdown_option"
+            className="dropdown_option_wrapper"
             justify="between"
             paddingX="sm"
             paddingY="xxs"
         >
-          {children ? children : <Body text={option.label} />}
+          {children ?
+              children :
+              <Body dark={dark}
+                  text={option.label}
+              />
+          }
         </Flex>
       </ListItem>
     </div>

data/app/pb_kits/playbook/pb_dropdown/subcomponents/DropdownTrigger.tsx CHANGED Viewed

@@ -21,6 +21,7 @@ type DropdownTriggerProps = {
   children?: React.ReactChild[] | React.ReactChild;
   className?: string;
   customDisplay?: React.ReactChild[] | React.ReactChild;
+  dark?: boolean;
   data?: { [key: string]: string };
   htmlOptions?: {[key: string]: string | number | boolean | (() => void)},
   id?: string;
@@ -30,9 +31,10 @@ type DropdownTriggerProps = {
 const DropdownTrigger = (props: DropdownTriggerProps) => {
   const {
     aria = {},
-    className,
     children,
+    className,
     customDisplay,
+    dark = false,
     data = {},
     htmlOptions = {},
     id,
@@ -41,15 +43,17 @@ const DropdownTrigger = (props: DropdownTriggerProps) => {
   const {
     autocomplete,
-    handleWrapperClick,
-    selected,
     filterItem,
     handleChange,
-    toggleDropdown,
-    isDropDownClosed,
+    handleWrapperClick,
     inputRef,
+    inputWrapperRef,
+    isDropDownClosed,
     isInputFocused,
+    selected,
     setIsInputFocused,
+    toggleDropdown,
+    triggerRef,
   } = useContext(DropdownContext);
   const handleKeyDown = useHandleOnKeyDown();
@@ -63,9 +67,11 @@ const DropdownTrigger = (props: DropdownTriggerProps) => {
     className
   );
-  const triggerWrapperClasses = `dropdown_trigger_wrapper ${
-    isInputFocused && "dropdown_trigger_wrapper_focus"
-  } ${!autocomplete && "dropdown_trigger_wrapper_select_only"}`;
+  const triggerWrapperClasses = buildCss(
+    "dropdown_trigger_wrapper",
+    isInputFocused && "focus",
+    !autocomplete && "select_only"
+  );
   const customDisplayPlaceholder = selected.label ? (
     <b>{selected.label}</b>
@@ -92,79 +98,91 @@ const DropdownTrigger = (props: DropdownTriggerProps) => {
         className={classes}
         id={id}
     >
-      {children ? (
-        <div
-            onClick={() => toggleDropdown()}
-            onKeyDown= {handleKeyDown}
-            style={{ display: "inline-block" }}
-            tabIndex= {0}
-        >
-          {children}
-        </div>
-      ) : (
-        <>
-          <Flex
-              align="center"
-              borderRadius="lg"
-              className={triggerWrapperClasses}
-              cursor={`${autocomplete ? "text" : "pointer"}`}
-              htmlOptions={{
-                onClick: () => handleWrapperClick(),
-                onKeyDown: handleKeyDown,
-                tabIndex: "0",
-              }}
-              justify="between"
-              paddingX="sm"
-              paddingY="xs"
-          >
-            <FlexItem>
-              <Flex align="center">
-                {customDisplay ? (
-                  <Flex align="center">
-                    {customDisplay}
-                    <Body paddingLeft={`${selected.label ? "xs" : "none"}`}>
-                      {customDisplayPlaceholder}
-                    </Body>
-                  </Flex>
-                ) : (
-                  <Body text={defaultDisplayPlaceholder} />
-                )}
-                {autocomplete && (
-                  <input
-                      className="dropdown_input"
-                      onChange={handleChange}
-                      onClick={() => toggleDropdown()}
-                      onFocus={() => setIsInputFocused(true)}
-                      onKeyDown={handleKeyDown}
-                      placeholder={
-                        selected.label
-                          ? ""
-                          : placeholder
-                          ? placeholder
-                          : "Select..."
-                      }
-                      ref={inputRef}
-                      value={filterItem}
-                  />
-                )}
-              </Flex>
-            </FlexItem>
-              <Body
-                  display="flex"
+      {
+        !triggerRef && (
+          children ? (
+            <div
+                onClick={() => toggleDropdown()}
+                onKeyDown= {handleKeyDown}
+                ref={inputWrapperRef}
+                style={{ display: "inline-block" }}
+                tabIndex= {0}
+            >
+              {children}
+            </div>
+          ) : (
+            <>
+              <Flex
+                  align="center"
+                  borderRadius="lg"
+                  className={triggerWrapperClasses}
+                  cursor={`${autocomplete ? "text" : "pointer"}`}
                   htmlOptions={{
-                    onClick: (e: Event) => {e.stopPropagation();handleWrapperClick()}
+                    onClick: () => handleWrapperClick(),
+                    onKeyDown: handleKeyDown,
+                    tabIndex: "0",
+                    ref:inputWrapperRef
                   }}
-                  key={`${isDropDownClosed ? "chevron-down" : "chevron-up"}`}
+                  justify="between"
+                  paddingX="sm"
+                  paddingY="xs"
               >
-                <Icon
-                    cursor="pointer"
-                    icon={`${isDropDownClosed ? "chevron-down" : "chevron-up"}`}
-                    size="sm"
-                />
-              </Body>
-          </Flex>
-        </>
-      )}
+                <FlexItem>
+                  <Flex align="center">
+                    {customDisplay ? (
+                      <Flex align="center">
+                        {customDisplay}
+                        <Body dark={dark}
+                            paddingLeft={`${selected.label ? "xs" : "none"}`}
+                        >
+                          {customDisplayPlaceholder}
+                        </Body>
+                      </Flex>
+                    ) : (
+                      <Body dark={dark}
+                          text={defaultDisplayPlaceholder}
+                      />
+                    )}
+                    {autocomplete && (
+                      <input
+                          className="dropdown_input"
+                          onChange={handleChange}
+                          onClick={() => toggleDropdown()}
+                          onFocus={() => setIsInputFocused(true)}
+                          onKeyDown={handleKeyDown}
+                          placeholder={
+                            selected.label
+                              ? ""
+                              : placeholder
+                              ? placeholder
+                              : "Select..."
+                          }
+                          ref={inputRef}
+                          value={filterItem}
+                      />
+                    )}
+                  </Flex>
+                </FlexItem>
+                  <Body
+                      dark={dark}
+                      display="flex"
+                      htmlOptions={{
+                        onClick: (e: Event) => {e.stopPropagation();handleWrapperClick()}
+                      }}
+                      key={`${isDropDownClosed ? "chevron-down" : "chevron-up"}`}
+                  >
+                    <Icon
+                        cursor="pointer"
+                        dark={dark}
+                        icon={`${isDropDownClosed ? "chevron-down" : "chevron-up"}`}
+                        size="sm"
+                    />
+                  </Body>
+              </Flex>
+            </>
+          )
+        )
+      }
     </div>
   );
 };

data/app/pb_kits/playbook/pb_dropdown/utilities/clickOutsideHelper.tsx ADDED Viewed

@@ -0,0 +1,41 @@
+type HandleClickOutsideType = {
+  inputWrapperRef?: React.RefObject<HTMLDivElement>;
+  dropdownContainerRef?: React.RefObject<HTMLDivElement>;
+  setIsDropDownClosed?: (value: boolean) => void;
+  setFocusedOptionIndex?: (value: number) => void;
+  setIsInputFocused?: (value: boolean) => void;
+};
+export const handleClickOutside =
+  ({
+    inputWrapperRef,
+    dropdownContainerRef,
+    setIsDropDownClosed,
+    setFocusedOptionIndex,
+    setIsInputFocused,
+  }: HandleClickOutsideType) =>
+  (e: MouseEvent) => {
+    let targetElement = e.target as HTMLElement;
+    let shouldClose = true;
+    //Only needed for when useDropdown hook used with external trigger
+    while (targetElement && shouldClose) {
+      if (
+        targetElement.getAttribute("data-dropdown") === "pb-dropdown-trigger"
+      ) {
+        shouldClose = false;
+      }
+      targetElement = targetElement.parentElement as HTMLElement;
+    }
+    if (
+      inputWrapperRef.current &&
+      !inputWrapperRef.current.contains((e.target as HTMLElement)) &&
+      dropdownContainerRef.current &&
+      !dropdownContainerRef.current.contains((e.target as HTMLElement)) &&
+      shouldClose
+    ) {
+      setIsDropDownClosed(true);
+      setFocusedOptionIndex(-1);
+      setIsInputFocused(false);
+    }
+  };

data/app/pb_kits/playbook/pb_dropdown/utilities/index.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export { separateChildComponents, prepareSubcomponents } from './subComponentHelper';
2	+ export { handleClickOutside } from './clickOutsideHelper';

data/app/pb_kits/playbook/pb_dropdown/utilities/subComponentHelper.tsx CHANGED Viewed

@@ -4,11 +4,12 @@ import DropdownContainer from "../subcomponents/DropdownContainer";
 type PrepareComponentsProps = {
   children: React.ReactChild[] | React.ReactChild;
-  hasTriggerSubcomponent: boolean;
-  hasContainerSubcomponent: boolean;
-  trigger: React.ReactChild;
   container: React.ReactChild;
+  dark?: boolean;
+  hasContainerSubcomponent: boolean;
+  hasTriggerSubcomponent: boolean;
   otherChildren: React.ReactChild[];
+  trigger: React.ReactChild;
 };
 export const separateChildComponents = (children: React.ReactChild[] | React.ReactChild | ReactElement[]) => {
@@ -36,19 +37,20 @@ export const prepareSubcomponents = ({
   trigger,
   container,
   otherChildren,
+  dark
 }: PrepareComponentsProps) => {
   const componentsToRender = [];
   if (!hasTriggerSubcomponent && !hasContainerSubcomponent) {
-    componentsToRender.push(<DropdownTrigger />);
-    componentsToRender.push(<DropdownContainer>{children}</DropdownContainer>);
+    componentsToRender.push(<DropdownTrigger dark={dark}/>);
+    componentsToRender.push(<DropdownContainer dark={dark}>{children}</DropdownContainer>);
   } else if (!hasTriggerSubcomponent && hasContainerSubcomponent) {
-    componentsToRender.push(<DropdownTrigger />);
+    componentsToRender.push(<DropdownTrigger dark={dark}/>);
     componentsToRender.push(children);
   } else if (hasTriggerSubcomponent && !hasContainerSubcomponent) {
     componentsToRender.push(trigger);
     componentsToRender.push(
-      <DropdownContainer>{otherChildren}</DropdownContainer>
+      <DropdownContainer dark={dark}>{otherChildren}</DropdownContainer>
     );
   } else {
     componentsToRender.push(trigger);

data/app/pb_kits/playbook/pb_file_upload/file_upload.html.erb CHANGED Viewed

@@ -1,4 +1,9 @@
-<%= pb_content_tag do %>
+<%= content_tag("div",
+    aria: object.aria,
+    class: object.classname,
+    data: object.data,
+    id: object.id,
+    **combined_html_options) do %>
       <%= pb_rails("form_group", props: {cursor: "pointer", full_width: object.full_width}) do %>
         <label for="upload-<%= object.id %>" class="pb_button_kit_secondary_inline_enabled"><%= "#{object.label}" %></label>
         <%= pb_rails("text_input", props: {

data/app/pb_kits/playbook/pb_filter/filter.html.erb CHANGED Viewed

@@ -1,4 +1,8 @@
-<%= pb_content_tag do %>
+<%= content_tag(:div,
+    id: object.id,
+    data: object.data,
+    class: object.classname,
+    **combined_html_options) do %>
     <%= object.wrapper do %>
       <%= pb_rails("flex", props: { orientation: "row", padding_right: "lg", vertical: "center" }) do %>
         <% if (object.template != "sort_only") %>

data/app/pb_kits/playbook/pb_fixed_confirmation_toast/fixed_confirmation_toast.html.erb CHANGED Viewed

@@ -1,4 +1,9 @@
-<%= pb_content_tag do %>
+<%= content_tag(:div,
+    aria: object.aria,
+    id: object.id,
+    data: object.data,
+    class: object.classname,
+    **combined_html_options) do %>
     <%= pb_rails("icon", props: { icon: object.icon_value, classname: "pb_icon", fixed_width: true }) %>
     <% if content %>

data/app/pb_kits/playbook/pb_flex/flex.html.erb CHANGED Viewed

@@ -1,3 +1,7 @@
-<%= pb_content_tag do %>
+<%= content_tag(:div,
+    id: object.id,
+    data: object.data,
+    class: object.classname,
+    **combined_html_options) do %>
   <%= content.presence %>
 <% end %>

data/app/pb_kits/playbook/pb_flex/flex_item.html.erb CHANGED Viewed

@@ -1,4 +1,8 @@
-<%= pb_content_tag(:div,
-    style: object.style_value) do %>
+<%= content_tag(:div,
+    id: object.id,
+    data: object.data,
+    class: object.classname,
+    style: object.style_value,
+    **combined_html_options) do %>
   <%= content.presence %>
 <% end %>

data/app/pb_kits/playbook/pb_form_group/form_group.html.erb CHANGED Viewed

@@ -1,3 +1,8 @@
-<%= pb_content_tag do %>
+<%= content_tag(:div,
+    aria: object.aria,
+    class: object.classname,
+    data: object.data,
+    id: object.id,
+    **combined_html_options) do %>
   <%= content.presence %>
 <% end %>

data/app/pb_kits/playbook/pb_form_pill/form_pill.html.erb CHANGED Viewed

@@ -1,4 +1,4 @@
-<%= pb_content_tag(:div, class: object.classname + object.size_class) do %>
+<%= content_tag(:div, id: object.id, data: object.data, class: object.classname + object.size_class, **combined_html_options) do %>
   <% if object.name.present? %>
     <%= pb_rails("avatar", props: { name: object.name, image_url: object.avatar_url, size: "xs" }) %>
       <%= pb_rails("title", props: { text: object.name, size: 4, classname: "pb_form_pill_text" }) %>

data/app/pb_kits/playbook/pb_hashtag/hashtag.html.erb CHANGED Viewed

@@ -1,4 +1,9 @@
-<%= pb_content_tag(:span) do %>
+<%= content_tag(:span,
+    aria: object.aria,
+    class: object.classname,
+    data: object.data,
+    id: object.id,
+    **combined_html_options) do %>
   <%= link_to object.url, target: object.link_option do %>
     <%= pb_rails("badge", props: { dark: object.dark, variant: "primary", text: object.hashtag_text }) %>
   <% end %>

data/app/pb_kits/playbook/pb_highlight/highlight.html.erb CHANGED Viewed

@@ -1,4 +1,8 @@
-<%= pb_content_tag(:span) do %>
+<%= content_tag(:span,
+    id: object.id,
+    data: object.data,
+    class: object.classname,
+    **combined_html_options) do %>
     <mark>
       <%= content.presence || object.text %>
     </mark>

data/app/pb_kits/playbook/pb_home_address_street/home_address_street.html.erb CHANGED Viewed

@@ -1,4 +1,8 @@
-<%= pb_content_tag do %>
+<%= content_tag(:div,
+    id: object.id,
+    data: object.data,
+    class: object.classname,
+    **combined_html_options) do %>
   <%= pb_rails("home_address_street/#{emphasis}_emphasis", props: object.send("#{emphasis}_emphasis_props")) %>
 <% end %>

data/app/pb_kits/playbook/pb_icon_circle/icon_circle.html.erb CHANGED Viewed

@@ -1,3 +1,8 @@
-<%= pb_content_tag do %>
-  <%= pb_rails("icon", props: { dark: object.dark, icon: object.icon, fixed_width: true }) %>
+<%= content_tag(:div,
+    aria: object.aria,
+    class: object.classname,
+    data: object.data,
+    id: object.id,
+    **combined_html_options) do %>
+    <%= pb_rails("icon", props: { dark: object.dark, icon: object.icon, fixed_width: true }) %>
 <% end %>

data/app/pb_kits/playbook/pb_icon_stat_value/icon_stat_value.html.erb CHANGED Viewed

@@ -1,4 +1,9 @@
-<%= pb_content_tag do %>
+<%= content_tag(:div,
+    aria: object.aria,
+    id: object.id,
+    data: object.data,
+    class: object.classname,
+    **combined_html_options) do %>
     <%= pb_rails("icon_circle", props: {
         dark: object.dark,

data/app/pb_kits/playbook/pb_icon_value/icon_value.html.erb CHANGED Viewed

@@ -1,4 +1,9 @@
-<%= pb_content_tag do %>
+<%= content_tag(:div,
+  aria: object.aria,
+  class: object.classname,
+  data: object.data,
+  id: object.id,
+  **combined_html_options) do %>
   <%= pb_rails("body", props: { color: "light", dark: object.dark }) do %>
     <%= pb_rails("icon", props: { icon: object.icon, fixed_width: true }) %>
     <%= object.text %>

data/app/pb_kits/playbook/pb_label_pill/label_pill.html.erb CHANGED Viewed

@@ -1,4 +1,9 @@
-<%= pb_content_tag do %>
+<%= content_tag(:div,
+    aria: object.aria,
+    id: object.id,
+    data: object.data,
+    class: object.classname,
+    **combined_html_options) do %>
       <%= pb_rails("caption", props: { text: object.label, classname: "pb_label_pill_label"}) %>
       <%= pb_rails("pill", props: { text: object.pill_value, variant: object.variant, classname: "pb_label_pill_pill" }) %>
 <% end %>

data/app/pb_kits/playbook/pb_label_value/label_value.html.erb CHANGED Viewed

@@ -1,4 +1,9 @@
-<%= pb_content_tag do %>
+<%= content_tag(:div,
+    aria: object.aria,
+    id: object.id,
+    data: object.data,
+    class: object.classname,
+    **combined_html_options) do %>
     <%= pb_rails("caption", props: { text: object.label, dark: object.dark }) %>
     <% if object.variant == "details" %>
         <%= pb_rails("flex", props: {inline: true, vertical: "center"}) do %>

data/app/pb_kits/playbook/pb_layout/body.html.erb CHANGED Viewed

@@ -1,3 +1,7 @@
-<%= pb_content_tag(object.tag) do %>
+<%= content_tag(object.tag,
+    id: object.id,
+    data: object.data,
+    class: object.classname,
+    **combined_html_options) do %>
   <%= content.presence %>
 <% end %>