polaris_view_helpers 1.2.10 → 2.0.0

data/app/views/polaris/banner_icons/_warning.html.erb

@@ -1,6 +1,10 @@
-<span class="Polaris-Icon Polaris-Icon--colorWarning Polaris-Icon--applyColor">
-  <span class="Polaris-VisuallyHidden"></span>
+<span class="Polaris-Icon">
   <svg viewBox="0 0 20 20" class="Polaris-Icon__Svg" focusable="false" aria-hidden="true">
-    <path fill-rule="evenodd" d="M10 0C4.486 0 0 4.486 0 10s4.486 10 10 10 10-4.486 10-10S15.514 0 10 0zM9 6a1 1 0 1 1 2 0v4a1 1 0 1 1-2 0V6zm1 9a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"></path>
+    <path d="M10 6.75a.75.75 0 0 1 .75.75v3.5a.75.75 0 1 1-1.5 0v-3.5a.75.75 0 0 1 .75-.75Z">
+    </path>
+    <path d="M11 13.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z">
+    </path>
+    <path fill-rule="evenodd" d="M10 3.5c-1.045 0-1.784.702-2.152 1.447a449.26 449.26 0 0 1-2.005 3.847l-.028.052a403.426 403.426 0 0 0-2.008 3.856c-.372.752-.478 1.75.093 2.614.57.863 1.542 1.184 2.464 1.184h7.272c.922 0 1.895-.32 2.464-1.184.57-.864.465-1.862.093-2.614-.21-.424-1.113-2.147-2.004-3.847l-.032-.061a429.497 429.497 0 0 1-2.005-3.847c-.368-.745-1.107-1.447-2.152-1.447Zm-.808 2.112c.404-.816 1.212-.816 1.616 0 .202.409 1.112 2.145 2.022 3.88a418.904 418.904 0 0 1 2.018 3.875c.404.817 0 1.633-1.212 1.633h-7.272c-1.212 0-1.617-.816-1.212-1.633.202-.408 1.113-2.147 2.023-3.883a421.932 421.932 0 0 0 2.017-3.872Z">
+    </path>
   </svg>
 </span>

data/lib/polaris_view_helpers/helper.rb

@@ -1,7 +1,7 @@
 module PolarisViewHelpers
   module Helper
 
-    def polaris_css version = '7.5.0'
+    def polaris_css version = '13.9.5'
       major_version = version.split('.').first.to_i
       if major_version <= 6
         %[<link rel="stylesheet" href="https://unpkg.com/@shopify/polaris@#{version}/dist/styles.css" />].html_safe
@@ -44,6 +44,38 @@ module PolarisViewHelpers
       )
     end
 
+    def polaris_select(form:, attribute:, title: nil, selected: nil, options:, data: nil, select_options: {})
+      selected ||= form.object&.send(attribute)
+      selected_label = selected
+      our_options = options.map do |option|
+        real_option = option
+        if option.is_a? Array
+          real_option = OpenStruct.new(label: option[0], value: option[1])
+        elsif option.respond_to?(:label) && options.respond_to?(:value)
+          #real_option = option
+        else
+          real_option = OpenStruct.new(label: option[:label], value: option[:value])
+        end
+        if real_option.value.to_s == selected.to_s
+          selected_label = real_option.label
+        end
+        real_option
+      end
+      render(
+        partial: 'polaris/select',
+        locals: {
+          form: form,
+          attribute: attribute,
+          title: title,
+          selected: selected,
+          selected_label: selected_label,
+          options: our_options,
+          select_options: select_options,
+          data: data
+        }
+      )
+    end
+
     def polaris_page(&block)
       render(
         partial: 'polaris/page',
@@ -87,9 +119,9 @@ module PolarisViewHelpers
     end
 
     def polaris_layout_section(secondary: false, one_half: false, &block)
-      extra_class = secondary ? "Polaris-Layout__Section--secondary" : ""
+      extra_class = secondary ? " Polaris-Layout__Section--oneThird " : ""
       extra_class += " "
-      extra_class += one_half ? "Polaris-Layout__Section--oneHalf" : ""
+      extra_class += one_half ? " Polaris-Layout__Section--oneHalf " : ""
       render(
         partial: 'polaris/layout_section',
         locals: { block: block, extra_class: extra_class }
@@ -138,6 +170,13 @@ module PolarisViewHelpers
       )
     end
 
+    def polaris_block_stack(&block)
+      render(
+        partial: 'polaris/block_stack',
+        locals: { block: block }
+      )
+    end
+
     def polaris_button_link_to(name = nil, link_destination = nil, button_options = nil, &block)
       if block_given?
         button_options, link_destination, name = link_destination, name, nil
@@ -146,7 +185,7 @@ module PolarisViewHelpers
 
       additional_classes = button_options[:additional_classes] || ""
       (button_options[:modifiers] || []).each do |modifier|
-        additional_classes += "Polaris-Button--#{modifier} "
+        additional_classes += " Polaris-Button--#{modifier} "
       end
       render(
         partial: 'polaris/button_link_to',
@@ -329,11 +368,11 @@ module PolarisViewHelpers
       )
     end
 
-    def polaris_resource_list_item(attributes)
+    def polaris_resource_list_item(attributes = {}, &block)
       extra_classes = attributes[:media].present? ? "Polaris-ResourceList__Item--mediaThumbnail Polaris-ResourceList__Item--sizeMedium" : ""
       render(
         partial: 'polaris/resource_list_item',
-        locals: { attributes: attributes, extra_classes: extra_classes }
+        locals: { attributes: attributes, extra_classes: extra_classes, block: block }
       )
     end
 
@@ -373,6 +412,13 @@ module PolarisViewHelpers
       )
     end
 
+    def polaris_legacy_card(heading = nil, footer: nil, extra_class: "", &block)
+      render(
+        partial: 'polaris/legacy_card',
+        locals: { block: block, heading: heading, footer: footer, extra_class: extra_class }
+      )
+    end
+
     def polaris_footer_help(icon: 'next-help-circle', &block)
       render(
         partial: 'polaris/footer_help',

data/lib/polaris_view_helpers/version.rb

@@ -1,3 +1,3 @@
 module PolarisViewHelpers
-  VERSION = "1.2.10"
+  VERSION = "2.0.0"
 end

data/test/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/test/dummy/app/models/widget.rb

@@ -1,3 +1,7 @@
-class Widget < ApplicationRecord
+class Widget
+  include ActiveModel::API
+  #include ActiveModel::AttributeMethods
+  attr_accessor :title
+  #define_attribute_methods :title
   validates :title, presence: true
 end

data/test/dummy/app/views/home/_button_links.html.erb

@@ -1 +1 @@
-<%= polaris_button_link_to("Button text", root_path) %>
+<%= polaris_button_link_to("Button text", root_path, modifiers: ['variantSecondary']) %>

data/test/dummy/app/views/home/_button_links_with_modifiers.html.erb

@@ -1 +1 @@
-<%= polaris_button_link_to("Button text", root_path, modifiers: ['primary', 'sizeSlim']) %>
+<%= polaris_button_link_to("Button text", root_path, modifiers: ['variantPrimary', 'sizeLarge']) %>

data/test/dummy/app/views/home/_button_tag.html.erb

@@ -1,3 +1,3 @@
 
-<%= polaris_button_tag("Save Changes", type: "submit", modifiers: ['primary']) %>
-<%= polaris_button_tag("Reset", type: "reset") %>
+<%= polaris_button_tag("Save Changes", type: "submit", modifiers: ['variantPrimary']) %>
+<%= polaris_button_tag("Reset", type: "reset", modifiers: ['variantSecondary']) %>

data/test/dummy/app/views/home/_page_actions.html.erb

@@ -1,4 +1,4 @@
 <%= polaris_page_actions({
-  left: polaris_button_link_to("One thing", root_path),
-  right: polaris_button_link_to("Another thing", root_path, modifiers: ['primary'])
+  left: polaris_button_link_to("One thing", root_path, modifiers: ['variantSecondary']),
+  right: polaris_button_link_to("Another thing", root_path, modifiers: ['variantPrimary'])
 }) %>

data/test/dummy/app/views/home/_resource_list.html.erb

@@ -4,27 +4,29 @@
     Widget.new(title: "Widget Two")
   ]
 %>
-<%= polaris_resource_list do %>
-  <% @widgets.each do |widget| %>
+<%= polaris_legacy_card do %>
+  <%= polaris_resource_list do %>
+    <% @widgets.each do |widget| %>
+      <%= polaris_resource_list_item({
+        url: root_path,
+        media: polaris_thumbnail(src: "/product.jpg", alt: widget.title),
+        attribute_one: widget.title,
+        attribute_two: nil,
+        attribute_three: nil,
+        badges: [
+          polaris_badge("A badge")
+        ]
+      }) %>
+    <% end %>
     <%= polaris_resource_list_item({
-      url: root_path,
-      media: polaris_thumbnail(src: "/product.jpg", alt: widget.title),
-      attribute_one: widget.title,
-      attribute_two: nil,
-      attribute_three: nil,
-      badges: [
-        polaris_badge("A badge")
-      ]
-    }) %>
+        url: root_path,
+        media: polaris_thumbnail(src: nil, alt: "Some alt text"),
+        attribute_one: "Resource Item Title",
+        attribute_two: "Another attribute",
+        attribute_three: "Third Attribute",
+        badges: [
+          polaris_badge("A different badge")
+        ]
+      }) %>
   <% end %>
-  <%= polaris_resource_list_item({
-      url: root_path,
-      media: polaris_thumbnail(src: nil, alt: "Some alt text"),
-      attribute_one: "Resource Item Title",
-      attribute_two: "Another attribute",
-      attribute_three: "Third Attribute",
-      badges: [
-        polaris_badge("A different badge")
-      ]
-    }) %>
 <% end %>

data/test/dummy/app/views/home/_select.html.erb

@@ -0,0 +1,13 @@
+<%= form_with url: root_url do |form| %>
+  <%= polaris_select(
+    form: form,
+    attribute: 'select_company_name',
+    title: "Company name",
+    selected: 'octolabs',
+    options: [
+      {label: "Luther Corp", value: 'luther_corp'},
+      ["OctoLabs", 'octolabs'],
+      OpenStruct.new({label: "Vought", value: 'vought'})
+    ]
+  )%>
+<% end %>

data/test/dummy/app/views/home/_text_field.html.erb

@@ -1,6 +1,8 @@
 <%= form_with url: root_url do |form| %>
   <%= polaris_form_layout do %>
-    <%= polaris_text_field form, :name %>
-    <%= polaris_text_field form, :email, {}, :email_field %>
+    <%= polaris_block_stack do %>
+      <%= polaris_text_field form, :name %>
+      <%= polaris_text_field form, :email, {}, :email_field %>
+    <% end %>
   <% end %>
 <% end %>

data/test/dummy/app/views/home/index.html.erb

@@ -62,6 +62,14 @@ between the <code>&lt;body&gt;</code> tags with something like this.</p>
 <p>&nbsp;</p>
 <p>&nbsp;</p>
 
+<%= polaris_heading "Select" %>
+<%= demo_partial 'select' %>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+
+
+
 
 <%= polaris_heading "Links" %>
 <%= demo_partial 'links' %>

data/test/dummy/config/application.rb

@@ -1,6 +1,17 @@
 require File.expand_path('../boot', __FILE__)
 
-require 'rails/all'
+#require 'rails/all'
+
+require 'active_record/railtie'
+#require 'active_storage/engine'
+require 'action_controller/railtie'
+require 'action_view/railtie'
+require 'action_mailer/railtie'
+#require 'active_job/railtie'
+#require 'action_cable/engine'
+#require 'action_mailbox/engine'
+#require 'action_text/engine'
+require 'rails/test_unit/railtie'
 
 Bundler.require(*Rails.groups)
 require "polaris_view_helpers"

data/test/dummy/config/environments/development.rb

@@ -20,7 +20,7 @@ Rails.application.configure do
   config.active_support.deprecation = :log
 
   # Raise an error on page load if there are pending migrations.
-  config.active_record.migration_error = :page_load
+  #config.active_record.migration_error = :page_load
 
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large