glimmer-dsl-libui 0.5.16 → 0.5.19

data/examples/paginated_refined_table.rb

@@ -6,148 +6,21 @@ class PaginatedRefinedTable
   include Glimmer::LibUI::Application
   
   NAMES_FIRST = %w[
-    Liam
-    Noah
-    William
-    James
-    Oliver
-    Benjamin
-    Elijah
-    Lucas
-    Mason
-    Logan
-    Alexander
-    Ethan
-    Jacob
-    Michael
-    Daniel
-    Henry
-    Jackson
-    Sebastian
-    Aiden
-    Matthew
-    Samuel
-    David
-    Joseph
-    Carter
-    Owen
-    Wyatt
-    John
-    Jack
-    Luke
-    Jayden
-    Dylan
-    Grayson
-    Levi
-    Isaac
-    Gabriel
-    Julian
-    Mateo
-    Anthony
-    Jaxon
-    Lincoln
-    Joshua
-    Christopher
-    Andrew
-    Theodore
-    Caleb
-    Ryan
-    Asher
-    Nathan
-    Thomas
-    Leo
-    Isaiah
-    Charles
-    Josiah
-    Hudson
-    Christian
-    Hunter
-    Connor
-    Eli
-    Ezra
-    Aaron
-    Landon
-    Adrian
-    Jonathan
-    Nolan
-    Jeremiah
-    Easton
-    Elias
-    Colton
-    Cameron
-    Carson
-    Robert
-    Angel
-    Maverick
-    Nicholas
-    Dominic
-    Jaxson
-    Greyson
-    Adam
-    Ian
-    Austin
-    Santiago
-    Jordan
-    Cooper
-    Brayden
-    Roman
-    Evan
-    Ezekiel
-    Xaviar
-    Jose
-    Jace
-    Jameson
-    Leonardo
-    Axel
-    Everett
-    Kayden
-    Miles
-    Sawyer
-    Jason
-    Emma
-    Olivia
-    Bartholomew
-    Corey
-    Danielle
-    Eva
-    Felicity
+    Liam Noah William James Oliver Benjamin Elijah Lucas Mason Logan Alexander Ethan Jacob Michael Daniel Henry Jackson Sebastian
+    Aiden Matthew Samuel David Joseph Carter Owen Wyatt John Jack Luke Jayden Dylan Grayson Levi Isaac Gabriel Julian Mateo
+    Anthony Jaxon Lincoln Joshua Christopher Andrew Theodore Caleb Ryan Asher Nathan Thomas Leo Isaiah Charles Josiah Hudson
+    Christian Hunter Connor Eli Ezra Aaron Landon Adrian Jonathan Nolan Jeremiah Easton Elias Colton Cameron Carson Robert Angel
+    Maverick Nicholas Dominic Jaxson Greyson Adam Ian Austin Santiago Jordan Cooper Brayden Roman Evan Ezekiel Xaviar Jose Jace
+    Jameson Leonardo Axel Everett Kayden Miles Sawyer Jason Emma Olivia Bartholomew Corey Danielle Eva Felicity
   ]
   
   NAMES_LAST = %w[
-    Smith
-    Johnson
-    Williams
-    Brown
-    Jones
-    Miller
-    Davis
-    Wilson
-    Anderson
-    Taylor
-    George
-    Harrington
-    Iverson
-    Jackson
-    Korby
-    Levinson
+    Smith Johnson Williams Brown Jones Miller Davis Wilson Anderson Taylor George Harrington Iverson Jackson Korby Levinson
   ]
   
   CITIES = [
-    'Bellesville',
-    'Lombardia',
-    'Steepleton',
-    'Deerenstein',
-    'Schwartz',
-    'Hollandia',
-    'Saint Pete',
-    'Grandville',
-    'London',
-    'Berlin',
-    'Elktown',
-    'Paris',
-    'Garrison',
-    'Muncy',
-    'St Louis',
+    'Bellesville', 'Lombardia', 'Steepleton', 'Deerenstein', 'Schwartz', 'Hollandia', 'Saint Pete', 'Grandville', 'London',
+    'Berlin', 'Elktown', 'Paris', 'Garrison', 'Muncy', 'St Louis',
   ]
   
   STATES = [ 'AK', 'AL', 'AR', 'AZ', 'CA', 'CO', 'CT', 'DC', 'DE', 'FL', 'GA',
@@ -233,6 +106,8 @@ class PaginatedRefinedTable
           },
           table_editable: true,
           per_page: 20,
+          # page: 1, # initial page is 1
+          # visible_page_count: true, # page count can be hidden if preferred
         )
       }
     }

data/lib/glimmer/libui/custom_control/refined_table.rb

@@ -6,24 +6,36 @@ class RefinedTable
   option :table_editable, default: false
   option :per_page, default: 10
   option :page, default: 1
+  option :visible_page_count, default: false
+  option :filter_query, default: ''
   
-  attr_accessor :filtered_model_array, :filter_query, :filter_query_page_stack, :paginated_model_array
+  attr_accessor :filtered_model_array # filtered model array (intermediary, non-paginated)
+  attr_accessor :refined_model_array # paginated filtered model array
+  attr_reader :table_proxy
   
   before_body do
-    @filter_query = ''
-    @filter_query_page_stack = {}
-    @filtered_model_array = model_array.dup
-    @filtered_model_array_stack = {@filter_query => @filtered_model_array}
-    paginate_model_array
+    init_model_array
+  end
+  
+  after_body do
+    filter_model_array
+    
+    observe(self, :model_array) do
+      init_model_array
+    end
+    
+    observe(self, :filter_query) do
+      filter_model_array
+    end
   end
   
   body {
     vertical_box {
       table_filter
 
-      table_paginator
+      table_paginator if page_count > 1
       
-      @table = table {
+      @table_proxy = table {
         table_columns.each do |column_name, column_details|
           editable_value = on_clicked_value = nil
           if column_details.is_a?(Symbol) || column_details.is_a?(String)
@@ -41,7 +53,7 @@ class RefinedTable
         end
   
         editable table_editable
-        cell_rows <=> [self, :paginated_model_array]
+        cell_rows <=> [self, :refined_model_array]
       }
     }
   }
@@ -49,33 +61,17 @@ class RefinedTable
   def table_filter
     search_entry {
       stretchy false
-      text <=> [self, :filter_query,
-        before_write: ->(new_filter_query) {
-          if new_filter_query != filter_query
-            if !@filtered_model_array_stack.key?(new_filter_query)
-              @filtered_model_array_stack[new_filter_query] = model_array.dup.filter do |model|
-                @table.expand([model])[0].any? do |attribute_value|
-                  attribute_value.to_s.downcase.include?(new_filter_query.downcase)
-                end
-              end
-            end
-            @filtered_model_array = @filtered_model_array_stack[new_filter_query]
-            if new_filter_query.size > filter_query.size
-              @filter_query_page_stack[filter_query] = page
-            end
-            self.page = @filter_query_page_stack[new_filter_query] || correct_page(page)
-            paginate_model_array
-          end
-        }
-      ]
+      text <=> [self, :filter_query]
     }
   end
   
   def table_paginator
     horizontal_box {
       stretchy false
-
+      
       button('<<') {
+        enabled <= [self, :page, on_read: ->(val) {val > 1}]
+        
         on_clicked do
           unless self.page == 0
             self.page = 1
@@ -83,7 +79,10 @@ class RefinedTable
           end
         end
       }
+      
       button('<') {
+        enabled <= [self, :page, on_read: ->(val) {val > 1}]
+        
         on_clicked do
           unless self.page == 0
             self.page = [page - 1, 1].max
@@ -91,6 +90,7 @@ class RefinedTable
           end
         end
       }
+      
       entry {
         text <=> [self, :page,
                   on_read: :to_s,
@@ -98,7 +98,16 @@ class RefinedTable
                   after_write: ->(val) { paginate_model_array },
                  ]
       }
+      
+      if visible_page_count
+        label {
+          text <= [self, :refined_model_array, on_read: ->(val) {"of #{page_count} pages"}]
+        }
+      end
+      
       button('>') {
+        enabled <= [self, :page, on_read: ->(val) {val < page_count}]
+        
         on_clicked do
           unless self.page == 0
             self.page = [page + 1, page_count].min
@@ -106,7 +115,10 @@ class RefinedTable
           end
         end
       }
+      
       button('>>') {
+        enabled <= [self, :page, on_read: ->(val) {val < page_count}]
+        
         on_clicked do
           unless self.page == 0
             self.page = page_count
@@ -117,8 +129,35 @@ class RefinedTable
     }
   end
   
+  def init_model_array
+    @last_filter_query = nil
+    @filter_query_page_stack = {}
+    @filtered_model_array = model_array.dup
+    @filtered_model_array_stack = {'' => @filtered_model_array}
+    self.page = correct_page(page)
+    filter_model_array if @table_proxy
+  end
+  
+  def filter_model_array
+    return unless (@last_filter_query.nil? || filter_query != @last_filter_query)
+    if !@filtered_model_array_stack.key?(filter_query)
+      @filtered_model_array_stack[filter_query] = model_array.dup.filter do |model|
+        @table_proxy.expand([model])[0].any? do |attribute_value|
+          attribute_value.to_s.downcase.include?(filter_query.downcase)
+        end
+      end
+    end
+    @filtered_model_array = @filtered_model_array_stack[filter_query]
+    if @last_filter_query.nil? || filter_query.size > @last_filter_query.size
+      @filter_query_page_stack[filter_query] = correct_page(page)
+    end
+    self.page = @filter_query_page_stack[filter_query] || correct_page(page)
+    paginate_model_array
+    @last_filter_query = filter_query
+  end
+  
   def paginate_model_array
-    self.paginated_model_array = filtered_model_array[index, limit]
+    self.refined_model_array = filtered_model_array[index, limit]
   end
   
   def index
@@ -137,15 +176,15 @@ class RefinedTable
     [[page, 1].max, page_count].min
   end
   
-  # Ensure proxying properties to @table if body_root (vertical_box) doesn't support them
+  # Ensure proxying properties to @table_proxy if body_root (vertical_box) doesn't support them
   
   def respond_to?(method_name, *args, &block)
-    super || @table&.respond_to?(method_name, *args, &block)
+    super || @table_proxy&.respond_to?(method_name, *args, &block)
   end
   
   def method_missing(method_name, *args, &block)
-    if @table&.respond_to?(method_name, *args, &block)
-      @table&.send(method_name, *args, &block)
+    if @table_proxy&.respond_to?(method_name, *args, &block)
+      @table_proxy&.send(method_name, *args, &block)
     else
       super
     end

data/lib/glimmer/libui/custom_window.rb

@@ -31,8 +31,17 @@ module Glimmer
       
       class << self
         def launch(*args, &content)
-          launched_custom_shell = send(keyword, *args, &content)
-          launched_custom_shell.show
+          @@launched_custom_window = send(keyword, *args, &content)
+          @@launched_custom_window.show
+          @@launched_custom_window
+        end
+        
+        def launched_custom_window
+          @@launched_custom_window if defined?(@@launched_custom_window)
+        end
+        
+        def launched_application
+          launched_custom_window
         end
       end
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.19
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-31 00:00:00.000000000 Z
+date: 2022-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -275,6 +275,8 @@ files:
 - VERSION
 - bin/girb
 - bin/girb_runner.rb
+- docs/examples/GLIMMER-DSL-LIBUI-ADVANCED-EXAMPLES.md
+- docs/examples/GLIMMER-DSL-LIBUI-BASIC-EXAMPLES.md
 - examples/area_based_custom_controls.rb
 - examples/area_gallery.rb
 - examples/area_gallery2.rb