polaris_view_components 0.5.0 → 0.6.0

data/app/components/polaris/choice_list_component.rb

@@ -2,7 +2,7 @@
 
 module Polaris
   class ChoiceListComponent < Polaris::NewComponent
-    renders_many :checkboxes, -> (value:, disabled: false, **system_arguments) do
+    renders_many :checkboxes, ->(value:, disabled: false, **system_arguments) do
       Polaris::CheckboxComponent.new(
         form: @form,
         attribute: @attribute,
@@ -13,7 +13,7 @@ module Polaris
         **system_arguments
       )
     end
-    renders_many :radio_buttons, -> (value:, disabled: false, **system_arguments) do
+    renders_many :radio_buttons, ->(value:, disabled: false, **system_arguments) do
       Polaris::RadioButtonComponent.new(
         form: @form,
         attribute: @attribute,
@@ -21,7 +21,7 @@ module Polaris
         value: value,
         checked: @selected.include?(value),
         disabled: disabled || @disabled,
-        **system_arguments,
+        **system_arguments
       )
     end
 
@@ -49,7 +49,7 @@ module Polaris
       @system_arguments[:classes] = class_names(
         @system_arguments[:classes],
         "Polaris-ChoiceList",
-        "Polaris-ChoiceList--titleHidden": title_hidden,
+        "Polaris-ChoiceList--titleHidden": title_hidden
       )
     end
 

data/app/components/polaris/data_table/cell_component.rb

@@ -4,7 +4,7 @@ class Polaris::DataTable::CellComponent < Polaris::NewComponent
     top: "Polaris-DataTable__Cell--verticalAlignTop",
     bottom: "Polaris-DataTable__Cell--verticalAlignBottom",
     middle: "Polaris-DataTable__Cell--verticalAlignMiddle",
-    baseline: "Polaris-DataTable__Cell--verticalAlignBaseline",
+    baseline: "Polaris-DataTable__Cell--verticalAlignBaseline"
   }
   ALIGNMENT_OPTIONS = ALIGNMENT_MAPPINGS.keys
 
@@ -31,7 +31,7 @@ class Polaris::DataTable::CellComponent < Polaris::NewComponent
   end
 
   def system_arguments
-    { tag: "td" }.deep_merge(@system_arguments).tap do |args|
+    {tag: "td"}.deep_merge(@system_arguments).tap do |args|
       args[:classes] = class_names(
         args[:classes],
         "Polaris-DataTable__Cell",
@@ -42,7 +42,7 @@ class Polaris::DataTable::CellComponent < Polaris::NewComponent
         "Polaris-DataTable__Cell--total": @total,
         "Polaris-DataTable__Cell--sortable": @sort_url.present?,
         "Polaris-DataTable__Cell--sorted": @sorted,
-        "Polaris-DataTable--cellTotalFooter": @total_footer,
+        "Polaris-DataTable--cellTotalFooter": @total_footer
       )
     end
   end

data/app/components/polaris/data_table_component.rb

@@ -5,7 +5,7 @@ module Polaris
     ALIGNMENT_DEFAULT = :top
     ALIGNMENT_OPTIONS = [:top, :bottom, :middle, :baseline]
 
-    renders_many :columns, -> (title, **system_arguments, &block) do
+    renders_many :columns, ->(title, **system_arguments, &block) do
       DataTable::ColumnComponent.new(title, **system_arguments, &block)
     end
     renders_one :footer
@@ -27,10 +27,10 @@ module Polaris
     end
 
     def system_arguments
-      { tag: "div" }.deep_merge(@system_arguments).tap do |args|
+      {tag: "div"}.deep_merge(@system_arguments).tap do |args|
         args[:classes] = class_names(
           args[:classes],
-          "Polaris-DataTable",
+          "Polaris-DataTable"
         )
       end
     end

data/app/components/polaris/description_list_component.rb

@@ -5,7 +5,7 @@ module Polaris
     SPACING_DEFAULT = :loose
     SPACING_MAPPINGS = {
       SPACING_DEFAULT => "",
-      :tight => "Polaris-DescriptionList--spacingTight",
+      :tight => "Polaris-DescriptionList--spacingTight"
     }
     SPACING_OPTIONS = SPACING_MAPPINGS.keys
 
@@ -17,7 +17,7 @@ module Polaris
       @system_arguments[:classes] = class_names(
         @system_arguments[:classes],
         "Polaris-DescriptionList",
-        SPACING_MAPPINGS[fetch_or_fallback(SPACING_OPTIONS, spacing, SPACING_DEFAULT)],
+        SPACING_MAPPINGS[fetch_or_fallback(SPACING_OPTIONS, spacing, SPACING_DEFAULT)]
       )
     end
 
@@ -33,7 +33,7 @@ module Polaris
       def call
         safe_join [
           tag.dt(class: "Polaris-DescriptionList__Term") { @term },
-          tag.dd(class: "Polaris-DescriptionList__Description") { content },
+          tag.dd(class: "Polaris-DescriptionList__Description") { content }
         ]
       end
     end

data/app/components/polaris/display_text_component.rb

@@ -10,7 +10,7 @@ module Polaris
       small: "Polaris-DisplayText--sizeSmall",
       medium: "Polaris-DisplayText--sizeMedium",
       large: "Polaris-DisplayText--sizeLarge",
-      extra_large: "Polaris-DisplayText--sizeExtraLarge",
+      extra_large: "Polaris-DisplayText--sizeExtraLarge"
     }
     SIZE_OPTIONS = SIZE_MAPPINGS.keys
 
@@ -24,7 +24,7 @@ module Polaris
       @system_arguments[:classes] = class_names(
         @system_arguments[:classes],
         "Polaris-DisplayText",
-        SIZE_MAPPINGS[fetch_or_fallback(SIZE_OPTIONS, size, SIZE_DEFAULT)],
+        SIZE_MAPPINGS[fetch_or_fallback(SIZE_OPTIONS, size, SIZE_DEFAULT)]
       )
     end
 

data/app/components/polaris/dropzone/component.rb

@@ -5,7 +5,7 @@ module Polaris
     class Component < Polaris::Component
       ALLOWED_TYPES = %w[file image]
 
-      validates :type, inclusion: { in: ALLOWED_TYPES, message: "%{value} is not a valid type" }
+      validates :type, inclusion: {in: ALLOWED_TYPES, message: "%{value} is not a valid type"}
       validates :label_action, type: Action, allow_nil: true
 
       # TODO
@@ -77,52 +77,52 @@ module Polaris
           multiple: @allow_multiple,
           data: {
             action: "focus->polaris--dropzone#onFocus blur->polaris--dropzone#onBlur change->polaris--dropzone#onChange",
-            'polaris--dropzone-target': 'input',
+            'polaris--dropzone-target': "input"
           }
         }
       end
 
       private
 
-        def additional_aria
-          {
-            disabled: @disabled.to_s,
-          }
-        end
-
-        def additional_data
-          {
-            controller: "polaris--dropzone",
-            action: "click->polaris--dropzone#onClick #{drop_actions}",
-            'polaris--dropzone-accept-value': @accept,
-            'polaris--dropzone-allowMultiple-value': @allow_multiple.to_s,
-            'polaris--dropzone-disabled-value': @disabled.to_s,
-            'polaris--dropzone-focused-value': 'false',
-            'polaris--dropzone-drop-on-page-value': 'false',
-          }
-        end
+      def additional_aria
+        {
+          disabled: @disabled.to_s
+        }
+      end
 
-        def drop_actions
-          event_scope = @drop_on_page ? "@document" : ""
+      def additional_data
+        {
+          controller: "polaris--dropzone",
+          action: "click->polaris--dropzone#onClick #{drop_actions}",
+          'polaris--dropzone-accept-value': @accept,
+          'polaris--dropzone-allowMultiple-value': @allow_multiple.to_s,
+          'polaris--dropzone-disabled-value': @disabled.to_s,
+          'polaris--dropzone-focused-value': "false",
+          'polaris--dropzone-drop-on-page-value': "false"
+        }
+      end
 
-          [
-            "drop#{event_scope}->polaris--dropzone#onDrop",
-            "dragover#{event_scope}->polaris--dropzone#onDragOver",
-            "dragenter#{event_scope}->polaris--dropzone#onDragEnter",
-            "dragleave#{event_scope}->polaris--dropzone#onDragLeave"
-          ].join(" ")
-        end
+      def drop_actions
+        event_scope = @drop_on_page ? "@document" : ""
 
-        def classes
-          classes = %w[Polaris-DropZone Polaris-DropZone--sizeExtraLarge]
+        [
+          "drop#{event_scope}->polaris--dropzone#onDrop",
+          "dragover#{event_scope}->polaris--dropzone#onDragOver",
+          "dragenter#{event_scope}->polaris--dropzone#onDragEnter",
+          "dragleave#{event_scope}->polaris--dropzone#onDragLeave"
+        ].join(" ")
+      end
 
-          classes << "Polaris-DropZone--isDisabled" if @disabled
-          classes << "Polaris-DropZone--isDisabled" if @disabled
-          classes << "Polaris-DropZone--hasError" if @error.present?
-          classes << "Polaris-DropZone--hasOutline" if @outline
+      def classes
+        classes = %w[Polaris-DropZone Polaris-DropZone--sizeExtraLarge]
 
-          classes
-        end
+        classes << "Polaris-DropZone--isDisabled" if @disabled
+        classes << "Polaris-DropZone--isDisabled" if @disabled
+        classes << "Polaris-DropZone--hasError" if @error.present?
+        classes << "Polaris-DropZone--hasOutline" if @outline
+
+        classes
+      end
     end
   end
 end

data/app/components/polaris/empty_state_component.rb

@@ -5,11 +5,11 @@ module Polaris
     WITHIN_DEFAULT = :page
     WITHIN_MAPPINGS = {
       WITHIN_DEFAULT => "",
-      container: "Polaris-EmptyState--withinContentContainer",
+      :container => "Polaris-EmptyState--withinContentContainer"
     }
     WITHIN_OPTIONS = WITHIN_MAPPINGS.keys
 
-    renders_one :primary_action, -> (primary: true, **system_arguments) do
+    renders_one :primary_action, ->(primary: true, **system_arguments) do
       Polaris::ButtonComponent.new(primary: primary, **system_arguments)
     end
     renders_one :secondary_action, Polaris::ButtonComponent
@@ -32,7 +32,7 @@ module Polaris
         @system_arguments[:classes],
         "Polaris-EmptyState",
         WITHIN_MAPPINGS[fetch_or_fallback(WITHIN_OPTIONS, within, WITHIN_DEFAULT)],
-        "Polaris-EmptyState--fullWidth": full_width,
+        "Polaris-EmptyState--fullWidth": full_width
       )
     end
   end

data/app/components/polaris/exception_list/item_component.rb

@@ -3,7 +3,7 @@ class Polaris::ExceptionList::ItemComponent < Polaris::NewComponent
   STATUS_MAPPINGS = {
     STATUS_DEFAULT => "",
     :critical => "Polaris-ExceptionList--statusCritical",
-    :warning => "Polaris-ExceptionList--statusWarning",
+    :warning => "Polaris-ExceptionList--statusWarning"
   }
   STATUS_OPTIONS = STATUS_MAPPINGS.keys
 
@@ -21,7 +21,7 @@ class Polaris::ExceptionList::ItemComponent < Polaris::NewComponent
     @system_arguments[:classes] = class_names(
       @system_arguments[:classes],
       "Polaris-ExceptionList__Item",
-      STATUS_MAPPINGS[fetch_or_fallback(STATUS_OPTIONS, status, STATUS_DEFAULT)],
+      STATUS_MAPPINGS[fetch_or_fallback(STATUS_OPTIONS, status, STATUS_DEFAULT)]
     )
   end
 end

data/app/components/polaris/exception_list_component.rb

@@ -9,7 +9,7 @@ module Polaris
       @system_arguments[:tag] = "ul"
       @system_arguments[:classes] = class_names(
         @system_arguments[:classes],
-        "Polaris-ExceptionList",
+        "Polaris-ExceptionList"
       )
     end
 

data/app/components/polaris/filters_component.rb

@@ -13,7 +13,7 @@ module Polaris
         opts[:tag] = "div"
         opts[:classes] = class_names(
           @system_arguments[:classes],
-          "Polaris-Filters",
+          "Polaris-Filters"
         )
       end
     end
@@ -22,7 +22,7 @@ module Polaris
       def initialize(clear_button: true, **system_arguments)
         @system_arguments = system_arguments.merge(
           label_hidden: true,
-          clear_button: clear_button,
+          clear_button: clear_button
         )
       end
 

data/app/components/polaris/footer_help_component.rb

@@ -6,7 +6,7 @@ module Polaris
       @system_arguments = system_arguments
       @system_arguments[:classes] = class_names(
         @system_arguments[:classes],
-        "Polaris-FooterHelp",
+        "Polaris-FooterHelp"
       )
     end
   end

data/app/components/polaris/form_layout/group_component.rb

@@ -10,7 +10,7 @@ class Polaris::FormLayout::GroupComponent < Polaris::NewComponent
     @system_arguments[:tag] = "div"
     @system_arguments[:classes] = class_names(
       @system_arguments[:classes],
-      "Polaris-FormLayout__Items",
+      "Polaris-FormLayout__Items"
     )
 
     @wrapper_arguments = {}
@@ -18,7 +18,7 @@ class Polaris::FormLayout::GroupComponent < Polaris::NewComponent
     @wrapper_arguments[:role] = "group"
     @wrapper_arguments[:classes] = class_names(
       "Polaris-FormLayout--grouped": !condensed,
-      "Polaris-FormLayout--condensed": condensed,
+      "Polaris-FormLayout--condensed": condensed
     )
   end
 
@@ -28,7 +28,7 @@ class Polaris::FormLayout::GroupComponent < Polaris::NewComponent
       @system_arguments[:tag] = "div"
       @system_arguments[:classes] = class_names(
         @system_arguments[:classes],
-        "Polaris-FormLayout__Item",
+        "Polaris-FormLayout__Item"
       )
     end
 

data/app/components/polaris/form_layout/item_component.rb

@@ -8,7 +8,7 @@ class Polaris::FormLayout::ItemComponent < Polaris::NewComponent
     @system_arguments[:tag] = "div"
     @system_arguments[:classes] = class_names(
       @system_arguments[:classes],
-      "Polaris-FormLayout__Item",
+      "Polaris-FormLayout__Item"
     )
   end
 

data/app/components/polaris/form_layout_component.rb

@@ -2,11 +2,11 @@
 
 module Polaris
   class FormLayoutComponent < Polaris::NewComponent
-    renders_many :items, -> (**system_arguments) do
+    renders_many :items, ->(**system_arguments) do
       @counter += 1
       Polaris::FormLayout::ItemComponent.new(position: @counter, **system_arguments)
     end
-    renders_many :groups, -> (**system_arguments) do
+    renders_many :groups, ->(**system_arguments) do
       @counter += 1
       Polaris::FormLayout::GroupComponent.new(position: @counter, **system_arguments)
     end
@@ -18,7 +18,7 @@ module Polaris
       @system_arguments[:tag] = "div"
       @system_arguments[:classes] = class_names(
         @system_arguments[:classes],
-        "Polaris-FormLayout",
+        "Polaris-FormLayout"
       )
     end
 

data/app/components/polaris/heading_component.rb

@@ -13,7 +13,7 @@ module Polaris
       @system_arguments[:tag] = element
       @system_arguments[:classes] = class_names(
         @system_arguments[:classes],
-        'Polaris-Heading'
+        "Polaris-Heading"
       )
     end
 

data/app/components/polaris/headless_button.html.erb

@@ -19,4 +19,17 @@
       <%= content %>
     </div>
   <% end %>
+
+  <% if @disclosure.present? %>
+    <div class="Polaris-Button__Icon">
+      <% case @disclosure %>
+      <% when :down %>
+        <%= polaris_icon(name: "CaretDownMinor") %>
+      <% when :up %>
+        <%= polaris_icon(name: "CaretUpMinor") %>
+      <% when :select %>
+        <%= polaris_icon(name: "SelectMinor") %>
+      <% end %>
+    </div>
+  <% end %>
 </span>

data/app/components/polaris/headless_button.rb

@@ -6,7 +6,7 @@ module Polaris
     SIZE_MAPPINGS = {
       SIZE_DEFAULT => "",
       :slim => "Polaris-Button--sizeSlim",
-      :large => "Polaris-Button--sizeLarge",
+      :large => "Polaris-Button--sizeLarge"
     }
     SIZE_OPTIONS = SIZE_MAPPINGS.keys
 
@@ -15,10 +15,13 @@ module Polaris
       TEXT_ALIGN_DEFAULT => "",
       :left => "Polaris-Button--textAlignLeft",
       :center => "Polaris-Button--textAlignCenter",
-      :right => "Polaris-Button--textAlignRight",
+      :right => "Polaris-Button--textAlignRight"
     }
     TEXT_ALIGN_OPTIONS = TEXT_ALIGN_MAPPINGS.keys
 
+    DISCLOSURE_DEFAULT = false
+    DISCLOSURE_OPTIONS = [true, false, :down, :up, :select]
+
     renders_one :icon, IconComponent
 
     def initialize(
@@ -31,6 +34,8 @@ module Polaris
       loading: false,
       destructive: false,
       disabled: false,
+      disable_with_loader: false,
+      disclosure: DISCLOSURE_DEFAULT,
       external: false,
       full_width: false,
       submit: false,
@@ -39,15 +44,17 @@ module Polaris
       text_align: TEXT_ALIGN_DEFAULT,
       **system_arguments
     )
-      @tag = url.present? ? 'a' : 'button'
+      @tag = url.present? ? "a" : "button"
       @text_classes = class_names(
         "Polaris-Button__Text",
         "Polaris-Button--removeUnderline": plain && monochrome && remove_underline
       )
       @loading = loading
+      @disclosure = fetch_or_fallback(DISCLOSURE_OPTIONS, disclosure, DISCLOSURE_DEFAULT)
+      @disclosure = :down if @disclosure === true
 
       @system_arguments = system_arguments
-      @system_arguments[:type] = submit ? 'submit' : 'button'
+      @system_arguments[:type] = submit ? "submit" : "button"
       if loading
         @system_arguments[:disabled] = true
       end
@@ -59,6 +66,11 @@ module Polaris
       if disabled
         @system_arguments[:disabled] = disabled
       end
+      @system_arguments[:data] ||= {}
+      prepend_option(@system_arguments[:data], :controller, "polaris-button")
+      if disable_with_loader
+        prepend_option(@system_arguments[:data], :action, "polaris-button#disable")
+      end
       @system_arguments[:classes] = class_names(
         @system_arguments[:classes],
         "Polaris-Button",
@@ -80,7 +92,7 @@ module Polaris
     def system_arguments
       @system_arguments[:classes] = class_names(
         @system_arguments[:classes],
-        "Polaris-Button--iconOnly": icon.present? && content.blank?,
+        "Polaris-Button--iconOnly": icon.present? && content.blank?
       )
       @system_arguments
     end

data/app/components/polaris/icon_component.rb

@@ -11,7 +11,7 @@ module Polaris
       :warning => "Polaris-Icon--colorWarning",
       :highlight => "Polaris-Icon--colorHighlight",
       :success => "Polaris-Icon--colorSuccess",
-      :primary => "Polaris-Icon--colorPrimary",
+      :primary => "Polaris-Icon--colorPrimary"
     }
     COLOR_OPTIONS = COLOR_MAPPINGS.keys
 
@@ -29,7 +29,7 @@ module Polaris
         "Polaris-Icon",
         COLOR_MAPPINGS[fetch_or_fallback(COLOR_OPTIONS, color, COLOR_DEFAULT)],
         "Polaris-Icon--hasBackdrop" => backdrop,
-        "Polaris-Icon--applyColor" => color != :default,
+        "Polaris-Icon--applyColor" => color != :default
       )
     end
   end

data/app/components/polaris/index_table/cell_component.rb

@@ -5,11 +5,11 @@ class Polaris::IndexTable::CellComponent < Polaris::NewComponent
   end
 
   def system_arguments
-    { tag: "td" }.deep_merge(@system_arguments).tap do |args|
+    {tag: "td"}.deep_merge(@system_arguments).tap do |args|
       args[:classes] = class_names(
         args[:classes],
         "Polaris-IndexTable__TableCell",
-        "Polaris-IndexTable__TableCell--flush": @flush,
+        "Polaris-IndexTable__TableCell--flush": @flush
       )
     end
   end

data/app/components/polaris/index_table_component.rb

@@ -1,6 +1,6 @@
 module Polaris
   class IndexTableComponent < Polaris::NewComponent
-    renders_many :columns, -> (title, **system_arguments, &block) do
+    renders_many :columns, ->(title, **system_arguments, &block) do
       IndexTable::ColumnComponent.new(title, **system_arguments, &block)
     end
 
@@ -10,10 +10,10 @@ module Polaris
     end
 
     def system_arguments
-      { tag: "div" }.deep_merge(@system_arguments).tap do |args|
+      {tag: "div"}.deep_merge(@system_arguments).tap do |args|
         args[:classes] = class_names(
           args[:classes],
-          "Polaris-IndexTable",
+          "Polaris-IndexTable"
         )
       end
     end

data/app/components/polaris/inline_error_component.rb

@@ -7,7 +7,7 @@ module Polaris
       @system_arguments[:tag] = "div"
       @system_arguments[:classes] = class_names(
         @system_arguments[:classes],
-        "Polaris-InlineError",
+        "Polaris-InlineError"
       )
     end
 

data/app/components/polaris/label_component.rb

@@ -19,13 +19,13 @@ module Polaris
       @system_arguments[:tag] = "div"
       @system_arguments[:classes] = class_names(
         @system_arguments[:classes],
-        "Polaris-Label",
+        "Polaris-Label"
       )
 
       @label_options = {}
       @label_options[:class] = class_names(
         "Polaris-Label__Text",
-        "Polaris-Label__RequiredIndicator": required,
+        "Polaris-Label__RequiredIndicator": required
       )
     end
 

data/app/components/polaris/labelled_component.rb

@@ -2,7 +2,7 @@
 
 module Polaris
   class LabelledComponent < Polaris::NewComponent
-    renders_one :label_action, -> (**system_arguments) do
+    renders_one :label_action, ->(**system_arguments) do
       Polaris::ButtonComponent.new(plain: true, **system_arguments)
     end
 
@@ -38,7 +38,7 @@ module Polaris
         attribute: attribute,
         name: name,
         label: label,
-        required: required,
+        required: required
       }
     end
 

data/app/components/polaris/layout/annotated_section.rb

@@ -13,7 +13,7 @@ module Polaris
         @system_arguments = system_arguments
         @system_arguments[:classes] = class_names(
           @system_arguments[:classes],
-          "Polaris-Layout__AnnotatedSection",
+          "Polaris-Layout__AnnotatedSection"
         )
       end
     end

data/app/components/polaris/layout/section.rb

@@ -25,7 +25,7 @@ module Polaris
           "Polaris-Layout__Section--fullWidth" => full_width,
           "Polaris-Layout__Section--oneHalf" => one_half,
           "Polaris-Layout__Section--oneThird" => one_third,
-          "Polaris-Layout__Section--oneFourth" => one_fourth,
+          "Polaris-Layout__Section--oneFourth" => one_fourth
         )
       end
 

data/app/components/polaris/layout_component.rb

@@ -9,7 +9,7 @@ module Polaris
     # @param one_half [Boolean] The section will only take up 50% of the width
     # @param one_third [Boolean] The section will only take up 33.33% of the width
     # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
-    renders_many :sections, -> (**system_arguments) do
+    renders_many :sections, ->(**system_arguments) do
       @counter += 1
       Layout::Section.new(position: @counter, **system_arguments)
     end
@@ -19,7 +19,7 @@ module Polaris
     # @param title [String] Title
     # @param description [String] Description
     # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
-    renders_many :annotated_sections, -> (**system_arguments) do
+    renders_many :annotated_sections, ->(**system_arguments) do
       @counter += 1
       Layout::AnnotatedSection.new(position: @counter, **system_arguments)
     end
@@ -29,7 +29,7 @@ module Polaris
       @system_arguments = system_arguments
       @system_arguments[:classes] = class_names(
         @system_arguments[:classes],
-        'Polaris-Layout'
+        "Polaris-Layout"
       )
     end
 

data/app/components/polaris/link_component.rb

@@ -24,7 +24,7 @@ module Polaris
         @system_arguments[:classes],
         "Polaris-Link",
         "Polaris-Link--monochrome" => monochrome,
-        "Polaris-Link--removeUnderline" => no_underline,
+        "Polaris-Link--removeUnderline" => no_underline
       )
     end
 
@@ -32,7 +32,7 @@ module Polaris
       render(Polaris::BaseComponent.new(**@system_arguments)) do
         safe_join [
           content.strip.html_safe,
-          (external_icon if @external),
+          (external_icon if @external)
         ].compact
       end
     end
@@ -42,7 +42,7 @@ module Polaris
     def external_icon
       tag.span(class: "Polaris-Link__IconLockup") do
         tag.span(class: "Polaris-Link__IconLayout") do
-          polaris_icon(name: "ExternalSmallMinor", aria: { label: "(opens a new window)" })
+          polaris_icon(name: "ExternalSmallMinor", aria: {label: "(opens a new window)"})
         end
       end
     end