glib-web 4.36.8 → 4.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46f0038f026665e4c7c8cefecd766bf728ca5c807ef1216b42ae0fab40fd644a
-  data.tar.gz: 06e074f158733ce9ea65bef4b53cddadabbe5eb468cb20175fbb8dc1352c7c81
+  metadata.gz: 4e3330ddf2fc14630ca3e1a47cc4500bb6ef0e6dd3cb9617a67d49034ccb3b95
+  data.tar.gz: bc130cbf2e69f387893fd3c84f6d5e431a9fc16e15ea17b7601281264c277727
 SHA512:
-  metadata.gz: 6428f530b4309e009f66905ec030ee68acbd98b9543ef4480e8835408fe3601d856d98e6e517cd2d76e33a4311ee3e0b873c1e51179a5d68da5b35663e1dc2c9
-  data.tar.gz: 61a08e0100e9d85582933e4931f19162e5b5303f309370420d0dc4d3cdd0c183dd9a5a4b325c506e4974ec913cc20518497251cfa76583615c67137bf8ddf47c
+  metadata.gz: 7b282c99b9141afaaf6662296f859451b9eb021276c294adfd8d402214bb42b91c4cd63da3a0713a4ec6a9c3dc6300c29758016a5e9db79ba4422671ea7da7da
+  data.tar.gz: 6432b2181a9f351ebd83d8adde7052b20f3b7b0a841fd98331532e1551efe475aacaf41cfd93de655badb1477f72251694b052d0c6c08089fbd9dcc17a098d34

data/app/helpers/glib/json_ui/menu_builder.rb

@@ -20,7 +20,7 @@ module Glib
         icon :icon
         action :onClick
         bool :disabled
-        # hash :tooltip
+        bool :expanded
         singleton_array :styleClass, :styleClasses
 
         def childButtons(block)

data/app/helpers/glib/json_ui/view_builder/fields.rb

@@ -324,6 +324,7 @@ class Glib::JsonUi::ViewBuilder
 
     class Radio < View
       string :label
+      string :subtitle
       string :value
       action :onClick
       string :offIcon

data/app/views/json_ui/garage/_nav_menu.json.jbuilder

@@ -58,6 +58,16 @@ if local_assigns[:top_nav] || json_ui_app_is_web?
       menu.divider
       menu.label text: 'Misc Menu'
 
+      menu.button icon: 'list', text: 'Parent', expanded: true, onClick: ->(action) do
+      end, childButtons: ->(parent) do
+        parent.button text: 'Child 1', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'lists/index')
+        end
+        parent.button text: 'Child 2', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'forms/index')
+        end
+      end
+
       menu.button icon: 'notifications', text: 'Notifications', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'notifications/index')
       end

data/app/views/json_ui/garage/actions/_reload.json.jbuilder

@@ -16,6 +16,12 @@ section.rows builder: ->(template) do
     action.windows_reload url: json_ui_garage_url(path: 'actions/index', reload_counter: reload_counter + 1)
   end
 
+  template.thumbnail title: 'windows/reload (onReload)', onClick: ->(action) do
+    action.windows_reload onReload: ->(saction) do
+      saction.snackbars_alert message: 'onReload called'
+    end
+  end
+
   template.thumbnail title: "components/replace (counter: #{reload_counter})", onClick: ->(action) do
     action.http_get url: json_ui_garage_url(path: 'actions/partial_update', reload_counter: reload_counter + 1)
   end

data/app/views/json_ui/garage/pages/_header.json.jbuilder

@@ -0,0 +1,11 @@
+panel.panels_vertical \
+  width: 'matchParent',
+  styleClass: 'card',
+  padding: glib_json_padding_body,
+  backgroundColor: '#b3bac2',
+  childViews: ->(vertical) do
+    vertical.h1 text: 'Header'
+    vertical.spacer height: 10
+    vertical.p text: 'This header uses a column layout to hide the heading on small screens.'
+    vertical.p text: 'On small screens, it will be replaced with a scrollable header.'
+  end

data/app/views/json_ui/garage/pages/full_width_height.json.jbuilder

@@ -3,14 +3,27 @@ json.title 'Pages'
 page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
-page.header padding: glib_json_padding_body, backgroundColor: '#b3bac2', childViews: ->(header) do
-  header.h1 text: 'Header'
-end
+page.header(
+  padding: glib_json_padding_body,
+  backgroundColor: '#b3bac2',
+  childViews: ->(header) do
+    header.h1 text: 'Header'
+  end
+)
 
-page.body height: 'matchParent', padding: glib_json_padding_body, childViews: ->(body) do
-  body.button width: 'matchParent', height: 'matchParent', text: 'Full Width/Height'
-end
+page.body(
+  height: 'matchParent',
+  padding: glib_json_padding_body,
+  childViews: ->(body) do
+    body.button width: 'matchParent', height: 'matchParent', text: 'Full Width/Height'
+  end
+)
 
-page.footer height: 80, padding: glib_json_padding_body, backgroundColor: '#b3bac2', childViews: ->(footer) do
-  footer.h1 text: 'Footer'
-end
+page.footer(
+  height: 80,
+  padding: glib_json_padding_body,
+  backgroundColor: '#b3bac2',
+  childViews: ->(footer) do
+    footer.h1 text: 'Footer'
+  end
+)

data/app/views/json_ui/garage/pages/layout.json.jbuilder

@@ -3,16 +3,41 @@ json.title 'Pages'
 page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
-page.header padding: glib_json_padding_body, backgroundColor: '#b3bac2', childViews: ->(header) do
-  header.h1 text: 'Header'
-end
+page.header(
+  childViews: ->(header) do
+    header.panels_column(
+      smAndDown: { hide: true },
+      childViews: ->(column) do
+        render "#{@path_prefix}/pages/header", panel: column, json: json
+      end
+    )
+  end
+)
+
+page.footer(
+  padding: glib_json_padding_body,
+  backgroundColor: '#b3bac2',
+  childViews: ->(footer) do
+    footer.h1 text: 'Footer'
+  end
+)
 
-page.footer padding: glib_json_padding_body, backgroundColor: '#b3bac2', childViews: ->(footer) do
-  footer.h1 text: 'Footer'
-end
+page.scroll(
+  childViews: ->(scroll) do
+    scroll.panels_column(
+      md: { hide: true },
+      childViews: ->(column) do
+        render "#{@path_prefix}/pages/header", panel: scroll, json: json
+      end
+    )
 
-page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
-  (1..100).each do |index|
-    scroll.label text: 'Content'
+    scroll.panels_vertical(
+      padding: glib_json_padding_body,
+      childViews: ->(vertical) do
+        (1..100).each do |index|
+          vertical.label text: 'Content'
+        end
+      end
+    )
   end
-end
+)

data/app/views/json_ui/garage/views/_checkbox_expand.json.jbuilder

@@ -0,0 +1,32 @@
+page = local_assigns[:page] || json_ui_page(json)
+
+page.body childViews: ->(body) do
+  body.panels_responsive width: 300, styleClass: 'border rounded-lg popovers-menu bg-white pa-4', childViews: ->(res) do
+    res.panels_form method: 'POST', url: json_ui_garage_url(path: 'forms/generic_post_all'), width: 'matchParent', childViews: ->(form) do
+      render 'json_ui/garage/views/expand_shrink_ex',
+        title: 'Choose fruits',
+        id: 'fruit',
+        expand: false,
+        view: form do |view|
+        view.fields_checkGroup name: 'user[fruits][]', styleClass: 'pb-2', childViews: ->(cg) do
+          cg.fields_check label: 'Banana', checkValue: 'banana'
+          cg.fields_check label: 'Grape', checkValue: 'grape'
+          cg.fields_check label: 'Strawberry', checkValue: 'strawberry'
+        end
+      end
+      form.spacer height: 8
+      render 'json_ui/garage/views/expand_shrink_ex',
+        title: 'Choose drinks',
+        id: 'drink',
+        expand: true,
+        view: form do |view|
+        view.fields_checkGroup name: 'user[drinks][]', styleClass: 'pb-2', childViews: ->(cg) do
+          cg.fields_check label: 'Coffee', checkValue: 'coffee'
+          cg.fields_check label: 'Water', checkValue: 'water'
+          cg.fields_check label: 'Milk', checkValue: 'milk'
+        end
+      end
+      form.fields_submit text: 'submit'
+    end
+  end
+end

data/app/views/json_ui/garage/views/_expand_shrink_ex.json.jbuilder

@@ -0,0 +1,28 @@
+expand = local_assigns[:expand] || false
+
+view.panels_responsive width: 'matchParent', childViews: ->(res) do
+  # shrink
+  res.panels_flow id: "#{id}-shrink", displayed: !expand, width: 'matchParent', styleClass: 'items-center justify-between flex-nowrap', childViews: ->(flow) do
+    flow.label text: title
+    flow.icon name: 'arrow_drop_down', size: 20, onClick: ->(action) do
+      action.runMultiple childActions: ->(saction) do
+        saction.components_set targetId: "#{id}-expand", data: { displayed: true }
+        saction.components_set targetId: "#{id}-shrink", data: { displayed: false }
+      end
+    end
+  end
+
+  # expand
+  res.panels_responsive id: "#{id}-expand", displayed: expand, width: 'matchParent', childViews: ->(sres) do
+    sres.panels_flow width: 'matchParent', styleClass: 'items-center justify-between flex-nowrap', childViews: ->(flow) do
+      flow.label text: title
+      flow.icon name: 'arrow_drop_up', size: 20, onClick: ->(action) do
+        action.runMultiple childActions: ->(saction) do
+          saction.components_set targetId: "#{id}-shrink", data: { displayed: true }
+          saction.components_set targetId: "#{id}-expand", data: { displayed: false }
+        end
+      end
+    end
+    yield(sres)
+  end
+end

data/app/views/json_ui/garage/views/controls.json.jbuilder

@@ -129,6 +129,18 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
       action.dialogs_alert message: 'Perform action'
     end
 
+  scroll.spacer height: 20
+  scroll.button text: 'popovers/show checkboxes', onClick: ->(action) do
+    action.popovers_show content: ->(pg) do
+      render 'json_ui/garage/views/checkbox_expand', page: pg
+    end
+  end
+
+  scroll.spacer height: 20
+  scroll.button text: 'popovers/open checkboxes', onClick: ->(action) do
+    action.popovers_open url: json_ui_garage_url(path: 'views/_checkbox_expand')
+  end
+
   scroll.spacer height: 20
   scroll.button \
     icon: 'info',

data/app/views/json_ui/garage/views/popovers_open.json.jbuilder

@@ -3,7 +3,8 @@ sleep 1
 page = json_ui_page json
 
 page.body childViews: ->(body) do
-  body.panels_responsive styleClass: 'popover-menu', childViews: ->(sres) do
+  body.panels_form styleClass: 'popover-menu', childViews: ->(sres) do
+    sres.fields_select options: ['A', 'B'].map { |v|  { text: v, value: v } }, name: 'user[select]', label: 'Select', width: 'matchParent'
     sres.p text: "Current time: #{DateTime.current}", styleClass: 'pb-2'
     sres.button text: 'Update', onClick: ->(action) do
       action.popovers_open url: json_ui_garage_url(path: 'views/popovers_open', key: params[:key]), key: params[:key], updateExisting: true

data/lib/glib/rubocop/cops/multiline_method_call_style.rb

@@ -0,0 +1,181 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Glib
+      # Enforces parentheses style for multi-line method calls with arguments.
+      #
+      # @example
+      #   # bad
+      #   page.footer padding: glib_json_padding_body, backgroundColor: '#b3bac2', childViews: ->(footer) do
+      #     footer.h1 text: 'Footer'
+      #   end
+      #
+      #   # bad
+      #   page.footer \
+      #     padding: glib_json_padding_body,
+      #     backgroundColor: '#b3bac2',
+      #     childViews: ->(footer) do
+      #       footer.h1 text: 'Footer'
+      #     end
+      #
+      #   # good
+      #   page.footer(
+      #     padding: glib_json_padding_body,
+      #     backgroundColor: '#b3bac2',
+      #     childViews: ->(footer) do
+      #       footer.h1 text: 'Footer'
+      #     end
+      #   )
+      class MultilineMethodCallStyle < Base
+        extend AutoCorrector
+
+        MSG = 'Use parentheses style for multi-line method calls: ' \
+              'wrap arguments in parentheses and place each argument on its own line.'
+
+        def on_send(node)
+          return unless multi_line_call_with_args?(node)
+          return if proper_parentheses_style?(node)
+          return if proper_backslash_style?(node) && allow_backslash?
+
+          add_offense(node) do |corrector|
+            autocorrect(corrector, node)
+          end
+        end
+
+        alias on_csend on_send
+
+        private
+
+        def multi_line_call_with_args?(node)
+          node.multiline? && node.arguments.any?
+        end
+
+        def allow_backslash?
+          # Allow backslash style without warnings when configured
+          # Set to true to allow both styles (but auto-correct will still convert to parentheses)
+          # Set to false to enforce parentheses style always
+          cop_config.fetch('AllowBackslashStyle', true)
+        end
+
+        def proper_backslash_style?(node)
+          source = processed_source.buffer.source
+          method_end_pos = node.loc.selector.end_pos
+
+          # Check if there's a backslash right after the method name
+          next_char_pos = method_end_pos
+          while next_char_pos < source.length && source[next_char_pos] == ' '
+            next_char_pos += 1
+          end
+
+          return false unless source[next_char_pos] == '\\'
+
+          # Check that each argument is on its own line
+          args = collect_arguments(node)
+          return false if args.empty?
+
+          args.each_cons(2) do |arg1, arg2|
+            return false if arg1.loc.line == arg2.loc.line
+          end
+
+          true
+        end
+
+        def proper_parentheses_style?(node)
+          return false unless node.parenthesized?
+
+          # Check that first argument is on a new line after opening paren
+          first_arg = node.first_argument
+          return false if first_arg.loc.line == node.loc.selector.line
+
+          # Check that each argument is on its own line
+          args = collect_arguments(node)
+          return false if args.empty?
+
+          args.each_cons(2) do |arg1, arg2|
+            return false if arg1.loc.line == arg2.loc.line
+          end
+
+          # Check that closing paren is on its own line
+          source = processed_source.buffer.source
+          close_paren_pos = node.loc.end.begin_pos
+          line_start = source.rindex("\n", close_paren_pos) || 0
+          line_content = source[line_start...close_paren_pos].strip
+
+          return false unless line_content.empty?
+
+          true
+        end
+
+        def collect_arguments(node)
+          args = []
+
+          node.arguments.each do |arg|
+            if arg.hash_type?
+              # For hash arguments, treat each pair as a separate argument
+              arg.pairs.each { |pair| args << pair }
+            else
+              args << arg
+            end
+          end
+
+          args
+        end
+
+        def autocorrect(corrector, node)
+          method_end_pos = node.loc.selector.end_pos
+
+          # Find the indentation of the method call
+          line_begin_pos = processed_source.buffer.line_range(node.loc.line).begin_pos
+          base_indent = node.source_range.begin_pos - line_begin_pos
+          arg_indent = ' ' * (base_indent + 2)
+
+          # Build the new argument list
+          arg_parts = []
+          node.arguments.each do |arg|
+            next if arg.block_pass_type? # Skip block arguments like &block
+
+            if arg.hash_type?
+              arg.pairs.each do |pair|
+                arg_parts << pair.source
+              end
+            else
+              arg_parts << arg.source
+            end
+          end
+
+          # Build the replacement with parentheses style
+          if arg_parts.any?
+            # Opening paren on same line as method, arguments on separate lines
+            replacement = "(\n#{arg_indent}" + arg_parts.join(",\n#{arg_indent}")
+
+            # If there's a block, add it on the last argument line
+            if node.block_literal?
+              block_source = node.block_literal.source
+              replacement += " #{block_source}"
+            end
+
+            # Closing paren on its own line at base indentation
+            replacement += "\n#{' ' * base_indent})"
+          else
+            # No arguments, just the block (shouldn't happen for multi-line, but handle it)
+            replacement = if node.block_literal?
+                           " #{node.block_literal.source}"
+                         else
+                           '()'
+                         end
+          end
+
+          # Remove everything from method name to end of node
+          range = Parser::Source::Range.new(
+            processed_source.buffer,
+            method_end_pos,
+            node.source_range.end_pos
+          )
+
+          corrector.replace(range, replacement)
+        end
+      end
+    end
+  end
+end

data/lib/glib/rubocop.rb

@@ -1 +1,2 @@
 require_relative 'rubocop/cops/localize'
+require_relative 'rubocop/cops/multiline_method_call_style'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.36.8
+  version: 4.37.0
 platform: ruby
 authors:
 - ''
@@ -321,6 +321,7 @@ files:
 - app/views/json_ui/garage/notifications/android_post.json.jbuilder
 - app/views/json_ui/garage/notifications/index.json.jbuilder
 - app/views/json_ui/garage/notifications/web_socket.json.jbuilder
+- app/views/json_ui/garage/pages/_header.json.jbuilder
 - app/views/json_ui/garage/pages/custom_style_class.json.jbuilder
 - app/views/json_ui/garage/pages/full_width.json.jbuilder
 - app/views/json_ui/garage/pages/full_width_height.json.jbuilder
@@ -378,6 +379,8 @@ files:
 - app/views/json_ui/garage/test_page/selectable.json.jbuilder
 - app/views/json_ui/garage/test_page/window.json.jbuilder
 - app/views/json_ui/garage/views/_chart_data.json.jbuilder
+- app/views/json_ui/garage/views/_checkbox_expand.json.jbuilder
+- app/views/json_ui/garage/views/_expand_shrink_ex.json.jbuilder
 - app/views/json_ui/garage/views/banners.json.jbuilder
 - app/views/json_ui/garage/views/calendar_data.json.jbuilder
 - app/views/json_ui/garage/views/charts.json.jbuilder
@@ -439,6 +442,7 @@ files:
 - lib/glib/mailer_tester.rb
 - lib/glib/rubocop.rb
 - lib/glib/rubocop/cops/localize.rb
+- lib/glib/rubocop/cops/multiline_method_call_style.rb
 - lib/glib/snapshot.rb
 - lib/glib/test_helpers.rb
 - lib/glib/time_freezable_mailer.rb