shimmer 0.0.21 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89571a33faa2d1fd1d8c9624ab42a51f019418efc9c91af68fb3bb0385b5f602
-  data.tar.gz: 814bca1dbd13b0e147df173b1b41077c0c585f4bd5b8e1b9e6933051d597f231
+  metadata.gz: 5b8e13a67c158deb5255b9a047415eca407baded8da093d1710c2a63d4e505fb
+  data.tar.gz: ecdfa43b53f32bca080085f2a1ffafe6393ba2c6739137843d54913fdadd0327
 SHA512:
-  metadata.gz: 6d1c9bfa6f442914ca03747cf391ebf52086cb2c92d334641715031539cef826f09e171d3510e20866780ed87a1829182872485f6cd143c833ddebab97e1abf8
-  data.tar.gz: 5db21bb6096a9a4a555b17c05d2ba128379f049ed87bae1e9fd9cddf824a05214c9858d8760924ea948d11645f9052b3d503167a098ece2ba97fb5ca498db754
+  metadata.gz: 84811ac4a7369eff4cd958e0a111151dc98a9998ef0a087959b2ecb41cc883def34ffe4db77d0eb2ec66be752106f654a8884d01aad7e8d5666a02ef80555ca9
+  data.tar.gz: 5830376aea6021ddf9b557ddab8ebe3b1157cc08ecc5badaead61cf024d24bed9013b3264b350c362b0b3b4f63eb295496595b07d900a36a0f2efe5b3a7a3912

data/lib/shimmer/form/builder.rb

@@ -13,7 +13,7 @@ module Shimmer
         end
       end
 
-      def input(method, as: guess_type(method), **options)
+      def input(method, as: guess_type(method), wrapper_options: {}, description: nil, **options)
         as ||= guess_type(method)
         options[:class] ||= "input__input"
         collection = options.delete :collection
@@ -25,12 +25,12 @@ module Shimmer
         options[:required] ||= true if options[:required].nil? && required_attributes.include?(method)
         options[:data] ||= {}
         options[:data][:controller] = options.delete(:controller) if options[:controller]
-        wrapper_data = {}
         extra = []
         input_class = self.class.input_registry[as]
         raise "Unknown type #{as}" unless input_class
         input = input_class.new(builder: self, method: method, options: options, id_method: id_method, collection: collection, name_method: name_method)
-        wrap method: method, content: input.render, classes: classes + ["input--#{as}"], label: options[:label], data: wrapper_data, extra: extra
+        wrapper_options.reverse_merge! input.wrapper_options
+        wrap method: method, content: input.render, classes: classes + ["input--#{as}"], label: options[:label], extra: extra, description: description, options: wrapper_options
       end
 
       private
@@ -65,13 +65,14 @@ module Shimmer
         object.class.types.keys if object.class.respond_to?(method.to_s.pluralize)
       end
 
-      def wrap(method:, content:, classes:, label:, data: nil, extra: nil)
+      def wrap(method:, content:, classes:, label:, data: nil, extra: nil, description: nil, options: {})
         if object&.errors&.[](method)&.any?
           classes << "input--error"
           errors = safe_join(object.errors[method].map { |e| content_tag :div, e, class: "input__error" })
         end
         label = label == false ? nil : self.label(method, label, class: "input__label")
-        content_tag(:div, safe_join([label, content, errors, extra].compact), class: ["input"] + classes, data: data)
+        description = description.presence ? content_tag(:div, description, class: "input__description") : nil
+        content_tag(:div, safe_join([label, content, description, errors, extra].compact), class: ["input"] + classes, **options)
       end
 
       def helper

data/lib/shimmer/form/checkbox_field.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Shimmer
+  module Form
+    class CheckboxField < Field
+      self.type = :checkbox
+
+      def render
+        builder.check_box method, options
+      end
+    end
+  end
+end

data/lib/shimmer/form/datetime_field.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Shimmer
+  module Form
+    class DatetimeField < Field
+      self.type = :datetime
+
+      def render
+        builder.datetime_field method, options
+      end
+    end
+  end
+end

data/lib/shimmer/form/field.rb

@@ -13,6 +13,10 @@ module Shimmer
         end
       end
 
+      def wrapper_options
+        {}
+      end
+
       def initialize(builder:, method:, collection:, id_method:, name_method:, options: {})
         @builder = builder
         @method = method

data/lib/shimmer/form/image_field.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Shimmer
+  module Form
+    class ImageField < Field
+      self.type = :image
+
+      def render
+        builder.file_field method, options.reverse_merge(accept: "image/*")
+      end
+    end
+  end
+end

data/lib/shimmer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shimmer
-  VERSION = "0.0.21"
+  VERSION = "0.0.23"
 end

data/src/consent.ts

@@ -53,12 +53,14 @@ export class Consent {
     role: ConsentCategory = "statistic"
   ): Promise<void> {
     await this.consentFor(role);
+    window.gtag("js", new Date());
     window.gtag("config", id);
     const script = document.createElement("script");
+    script.async = true;
     script.setAttribute(
       "src",
       `https://www.googletagmanager.com/gtag/js?id=${id}`
     );
-    document.head.appendChild(script);
+    document.head.prepend(script);
   }
 }

data/src/controllers/analytics.ts

@@ -12,12 +12,13 @@ declare global {
 }
 
 const dataLayer = (window.dataLayer = window.dataLayer ?? []);
-
-window.gtag = (...arg) => {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  dataLayer.push(arg as any);
-};
-window.gtag("js", new Date());
+function gtag(): void {
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  // eslint-disable-next-line prefer-rest-params
+  dataLayer.push(arguments);
+}
+window.gtag = gtag;
 
 export default class extends Controller {
   connect(): void {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shimmer
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.23
 platform: ruby
 authors:
 - Jens Ravens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2022-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -147,10 +147,13 @@ files:
 - lib/shimmer/controllers/sitemaps_controller.rb
 - lib/shimmer/form.rb
 - lib/shimmer/form/builder.rb
+- lib/shimmer/form/checkbox_field.rb
 - lib/shimmer/form/checkboxes_field.rb
 - lib/shimmer/form/date_field.rb
+- lib/shimmer/form/datetime_field.rb
 - lib/shimmer/form/email_field.rb
 - lib/shimmer/form/field.rb
+- lib/shimmer/form/image_field.rb
 - lib/shimmer/form/number_field.rb
 - lib/shimmer/form/password_field.rb
 - lib/shimmer/form/pdf_field.rb