playbook_ui 14.2.0.pre.alpha.play1490railsdialogdatafix3649 → 14.2.1.pre.alpha.PBNTR431fixingduplicatingtextareaclassname3689

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aee64888bd81c3d5f72d869a1b22400098eb47918a191fbc1c207ec1445c24e4
-  data.tar.gz: 070d35ca5b470fcdc364eed7861cec16e6a06c3cf6e1d74efe5ba1e12ba98d0b
+  metadata.gz: e5176e3600e405965bbf3825210db99f5e79045b2ab05ec5d9dd415b85029a7c
+  data.tar.gz: c7acd54ee584b58d4e7626f3988e03abc55c78d8eb897fa84601f42a6356bb19
 SHA512:
-  metadata.gz: 207ab69fd39ad89996ef5b2255f04071650d3cdf8167a95838ca00b65834d5c55015fd0a557b96901ad30dae773eb0653d57cea8bda9a92cd84633115dd1fdc4
-  data.tar.gz: 32e048396ec07f03f9ed30875fdceeed5609f7d8e8d9beccc6076703cfbf5530a9316a9c7ba8b8b770369adb010c29b26d40a91ec03469b0042271b6540ef5a3
+  metadata.gz: 49ca875dcc91d6e2beae3d93ff7ff9e741e8db0a4df9fb3a7c0561311a011fdf301308217f22c65708298ee6f5854015bb8929fc2f67e94820ffc64d1c50bd7e
+  data.tar.gz: 309f669294d766289d8b79a466d488107c69c243aa1725292b7c15c380ca87bd1f81a2d1c33d1c6c0395ad7a94f8df59f377e340c38342006dc8f0518ae12023

data/app/pb_kits/playbook/pb_circle_icon_button/_circle_icon_button.tsx

@@ -16,6 +16,7 @@ type CircleIconButtonProps = {
   htmlOptions?: {[key: string]: string | number | boolean | (() => void)},
   id?: string,
   link?: string,
+  loading?: boolean,
   onClick?: React.MouseEventHandler<HTMLElement>,
   newWindow?: boolean,
   type?: 'button' | 'submit' | 'reset' | undefined,
@@ -32,6 +33,7 @@ const CircleIconButton = (props: CircleIconButtonProps): React.ReactElement => {
     htmlOptions = {},
     icon,
     id,
+    loading = false,
     onClick = noop,
     type,
     link,
@@ -61,6 +63,7 @@ const CircleIconButton = (props: CircleIconButtonProps): React.ReactElement => {
           disabled={disabled}
           htmlType={type}
           link={link}
+          loading={loading}
           newWindow={newWindow}
           onClick={onClick}
           text={null}

data/app/pb_kits/playbook/pb_circle_icon_button/circle_icon_button.html.erb

@@ -1,5 +1,5 @@
 <%= pb_content_tag do %>
-  <%= pb_rails("button", props: {type: object.type, link: object.link, new_window:object.new_window, variant: object.variant, disabled: object.disabled, dark: object.dark}) do %>
+  <%= pb_rails("button", props: {type: object.type, loading: object.loading, link: object.link, new_window:object.new_window, variant: object.variant, disabled: object.disabled, dark: object.dark}) do %>
     <%= pb_rails("icon", props: {icon: object.icon, fixed_width: true, dark: object.dark}) %>
   <% end %>
 <% end %>

data/app/pb_kits/playbook/pb_circle_icon_button/circle_icon_button.rb

@@ -12,6 +12,8 @@ module Playbook
       prop :disabled, type: Playbook::Props::Boolean,
                       default: false
       prop :icon, required: true
+      prop :loading, type: Playbook::Props::Boolean,
+                     default: false
       prop :link
       prop :new_window, type: Playbook::Props::Boolean,
                         default: false

data/app/pb_kits/playbook/pb_circle_icon_button/circle_icon_button.test.js

@@ -15,3 +15,18 @@ test('default test', () => {
 
   expect(kit).toHaveClass('pb_circle_icon_button_kit')
 })
+
+test('passes loading prop to button', () => {
+  render(
+    <CircleIconButton
+        data={{ testid: 'loading-test' }}
+        icon="plus"
+        loading
+    />
+  )
+
+  const kit = screen.getByTestId('loading-test')
+  const button = kit.querySelector('.pb_button_kit_primary_inline_enabled_loading')
+  
+  expect(button).toBeInTheDocument()
+})

data/app/pb_kits/playbook/pb_circle_icon_button/docs/_circle_icon_button_loading.html.erb

@@ -0,0 +1,29 @@
+<%= pb_rails("circle_icon_button", props: {
+  variant: "primary",
+  icon: "plus",
+  loading: true
+}) %>
+
+<br/>
+
+<%= pb_rails("circle_icon_button", props: {
+  variant: "secondary",
+  icon: "pen",
+  loading: true
+}) %>
+
+<br/>
+
+<%= pb_rails("circle_icon_button", props: {
+  disabled: true,
+  icon: "times",
+  loading: true
+}) %>
+
+<br/>
+
+<%= pb_rails("circle_icon_button", props: {
+  variant: "link",
+  icon: "user",
+  loading: true
+}) %>

data/app/pb_kits/playbook/pb_circle_icon_button/docs/_circle_icon_button_loading.jsx

@@ -0,0 +1,43 @@
+import React from 'react'
+
+import CircleIconButton from '../_circle_icon_button'
+
+const CircleIconButtonLoading = (props) => (
+  <div>
+    <CircleIconButton
+        icon="plus"
+        loading
+        variant="primary"
+        {...props}
+    />
+
+    <br />
+
+    <CircleIconButton
+        icon="pen"
+        loading
+        variant="secondary"
+        {...props}
+    />
+
+    <br />
+
+    <CircleIconButton
+        disabled
+        icon="times"
+        loading
+        {...props}
+    />
+
+    <br />
+
+    <CircleIconButton
+        icon="user"
+        loading
+        variant="link"
+        {...props}
+    />
+  </div>
+)
+
+export default CircleIconButtonLoading

data/app/pb_kits/playbook/pb_circle_icon_button/docs/example.yml

@@ -3,8 +3,10 @@ examples:
   rails:
   - circle_icon_button_default: Default
   - circle_icon_button_link: Link
+  - circle_icon_button_loading: Loading
   
   react:
   - circle_icon_button_default: Default
   - circle_icon_button_click: Click Handler
   - circle_icon_button_link: Link
+  - circle_icon_button_loading: Loading

data/app/pb_kits/playbook/pb_circle_icon_button/docs/index.js

@@ -1,3 +1,4 @@
 export { default as CircleIconButtonDefault } from './_circle_icon_button_default.jsx'
 export { default as CircleIconButtonClick } from './_circle_icon_button_click.jsx'
 export { default as CircleIconButtonLink } from './_circle_icon_button_link.jsx'
+export { default as CircleIconButtonLoading } from './_circle_icon_button_loading.jsx'

data/app/pb_kits/playbook/pb_dialog/dialog.html.erb

@@ -22,11 +22,8 @@
             <% if object.cancel_button && object.confirm_button %>
                         <%= pb_rails("dialog/dialog_footer", props: {
                             cancel_button: object.cancel_button,
-                            cancel_button_id: object.cancel_button_id,
                             confirm_button: object.confirm_button,
-                            confirm_button_id: object.confirm_button_id,
-                            id: object.id,
-                            loading: object.loading
+                            id: object.id
                         }) %>
             <% end %>
 

data/app/pb_kits/playbook/pb_dialog/dialog.rb

@@ -13,11 +13,8 @@ module Playbook
       prop :should_close_on_overlay_click, type: Playbook::Props::Boolean, default: true
       prop :title
       prop :text
-      prop :loading
       prop :confirm_button
-      prop :confirm_button_id
       prop :cancel_button
-      prop :cancel_button_id
       prop :status, type: Playbook::Props::Enum,
                     values: ["info", "caution", "delete", "error", "success", "default", ""],
                     default: ""

data/app/pb_kits/playbook/pb_dialog/dialogHelper.js

@@ -3,27 +3,6 @@ const dialogHelper = () => {
   const closeTrigger = document.querySelectorAll("[data-close-dialog]");
   const dialogs = document.querySelectorAll(".pb_dialog_rails")
 
-  const loadingButton = document.querySelector('[data-disable-with="Loading"]');
-  if (loadingButton) {
-    loadingButton.addEventListener("click", function() {
-      const okayLoadingButton = document.querySelector('[data-disable-with="Loading"]');
-      const cancelButton = document.querySelector('[data-disable-cancel-with="Loading"]');
-      let currentClass = okayLoadingButton.className;
-      let cancelClass = cancelButton ? cancelButton.className : "";
-
-      let newClass = currentClass.replace("_enabled", "_disabled_loading");
-      let newCancelClass = cancelClass.replace("_enabled", "_disabled");
-
-      // Disable the buttons
-      okayLoadingButton.disabled = true;
-      if (cancelButton) cancelButton.disabled = true;
-
-      okayLoadingButton.className = newClass;
-      if (cancelButton) cancelButton.className = newCancelClass;
-    });
-  }
-
-
   openTrigger.forEach((open) => {
     open.addEventListener("click", () => {
       var openTriggerData = open.dataset.openDialog;

data/app/pb_kits/playbook/pb_dialog/dialog_footer.html.erb

@@ -3,12 +3,10 @@
     <% if object.confirm_button && object.cancel_button %>
         <div class="dialog-pseudo-footer"></div>
         <%= pb_rails("flex", props: { classname:object.classname, spacing:"between", padding_x:"sm", padding:"sm", padding_bottom:"sm" }) do %>
-            
-          <%= pb_rails("button", props: { type: "submit", id: object.confirm_button_id, data: loading_data,
-            }) do %>
+            <%= pb_rails("button", props: { type: "submit", id: object.confirm_button_id }) do %>
                 <%= object.confirm_button %>
             <% end %>
-            <%= pb_rails("button", props: { type: "button", data: {"close-dialog": "#{object.id}", "disable_cancel_with": cancel_loading }, id: object.cancel_button_id, variant: "link" }) do %>
+            <%= pb_rails("button", props: { type: "button", data: {"close-dialog": "#{object.id}" }, id: object.cancel_button_id, variant: "link"}) do %>
                 <%= object.cancel_button %>
             <% end %>
         <% end %>

data/app/pb_kits/playbook/pb_dialog/dialog_footer.rb

@@ -4,22 +4,13 @@ module Playbook
   module PbDialog
     class DialogFooter < Playbook::KitBase
       prop :cancel_button
-      prop :cancel_button_id
       prop :confirm_button
       prop :confirm_button_id
-      prop :loading
+      prop :cancel_button_id
 
       def classname
         generate_classname("dialog_footer")
       end
-
-      def cancel_loading
-        loading ? "Loading" : ""
-      end
-
-      def loading_data
-        loading ? { disable_with: "Loading" } : {}
-      end
     end
   end
 end

data/app/pb_kits/playbook/pb_dialog/docs/example.yml

@@ -10,7 +10,6 @@ examples:
   - dialog_stacked_alert: Stacked Button Alert
   - dialog_full_height: Full Height
   - dialog_full_height_placement: Full Height Placement
-  - dialog_loading: Loading
 
 
   react:

data/app/pb_kits/playbook/pb_textarea/_textarea.tsx

@@ -92,7 +92,6 @@ const Textarea = ({
       <Caption text={label} />
       {children || (
         <textarea
-            className="pb_textarea_kit"
             disabled={disabled}
             name={name}
             onChange={onChange}

data/app/pb_kits/playbook/pb_textarea/textarea.html.erb

@@ -15,7 +15,6 @@
     <%= text_area(
         :object,
         :method,
-        :class => "#{object.classname}",
         :max_characters => object.max_characters,
         :name => object.name,
         :onkeyup => object.onkeyup,