glimmer-dsl-libui 0.7.2 → 0.7.4

data/lib/glimmer/libui/control_proxy/table_proxy.rb

@@ -37,6 +37,28 @@ module Glimmer
         include Glimmer::FiddleConsumer
         
         CUSTOM_LISTENER_NAMES = ['on_changed', 'on_edited']
+        DEFAULT_COLUMN_SORT_BLOCK = lambda do |table_cell_row, column, table_proxy|
+          if table_cell_row.is_a?(Array)
+            value = table_cell_row[column]
+          else
+            attribute = table_proxy.column_attributes[column]
+            value = table_cell_row.send(attribute)
+          end
+          if value.is_a?(Array)
+            # This is needed to not crash on sorting an unsortable array
+            value = value.map do |element|
+              case element
+              when true
+                1
+              when false
+                0
+              else
+                element
+              end
+            end
+          end
+          value
+        end
         
         attr_reader :model_handler, :model, :table_params, :columns
       
@@ -66,6 +88,7 @@ module Glimmer
           configure_selection
           configure_header_visible
           configure_column_sort_indicators
+          configure_sorting
         end
         
         def post_initialize_child(child)
@@ -183,6 +206,7 @@ module Glimmer
           result = ::LibUI.table_header_visible(@libui)
           LibUI.integer_to_boolean(result)
         end
+        alias header_visible? header_visible
         
         def header_visible=(value)
           @header_visible = value
@@ -194,6 +218,17 @@ module Glimmer
         end
         alias set_header_visible header_visible=
         
+        def sortable
+          @sortable = true if @sortable.nil?
+          @sortable
+        end
+        alias sortable? sortable
+        
+        def sortable=(value)
+          @sortable = value
+        end
+        alias set_sortable sortable=
+        
         def column_attributes
           @column_attributes ||= columns.select {|column| column.is_a?(Column)}.map(&:name).map(&:underscore)
         end
@@ -224,7 +259,12 @@ module Glimmer
         end
         
         def data_bind_write(property, model_binding)
-          handle_listener('on_edited') { model_binding.call(cell_rows) } if property == 'cell_rows'
+          case property
+          when 'cell_rows'
+            handle_listener('on_edited') { model_binding.call(cell_rows) }
+          when 'selection'
+            handle_listener('on_selection_changed') { model_binding.call(selection) }
+          end
         end
         
         def array_deep_dup(array_or_object)
@@ -620,16 +660,14 @@ module Glimmer
         def register_column_listeners
           # register accumulated column listeners after table content is closed
           return if @columns.nil? || @columns.empty?
-          if @columns.any? {|column| column.is_a?(Column) && !column.column_listeners_for('on_clicked').empty? }
+          if @columns.any? {|column| column.is_a?(Column)}
             ::LibUI.table_header_on_clicked(@libui) do |_, column_index|
               actual_columns = @columns.select {|column| column.is_a?(Column)}
               column = actual_columns[column_index]
-              if column.is_a?(Column)
+              if column.is_a?(Column) && !column.is_a?(Column::ButtonColumnProxy)
                 column_listeners = column.column_listeners_for('on_clicked')
-                if !column_listeners.empty?
-                  column_listeners.each do |column_listener|
-                    column_listener.call(column, column_index)
-                  end
+                column_listeners.each do |column_listener|
+                  column_listener.call(column, column_index)
                 end
               end
             end
@@ -649,8 +687,47 @@ module Glimmer
         end
         
         def configure_column_sort_indicators
-          column_proxies.each {|c| c.configure_sort_indicator }
+          column_proxies.each(&:configure_sort_indicator)
         end
+        
+        def configure_sorting
+          if sortable?
+            columns.each do |column_object|
+              next unless column_object.is_a?(Column) && !column_object.is_a?(Column::ButtonColumnProxy)
+              column_object.on_clicked do |column_proxy, column|
+                sort_by_column(column_proxy, column)
+              end
+            end
+          end
+        end
+        
+        def sort_by_column(column_proxy, column)
+          return unless sortable? && cell_rows.is_a?(Array)
+          old_selection = backup_selection
+          column_proxy.toggle_sort_indicator
+          cell_rows.sort_by! {|table_cell_row| DEFAULT_COLUMN_SORT_BLOCK.call(table_cell_row, column, self) }
+          cell_rows.reverse! if column_proxy.sort_indicator == :descending
+          restore_selection(old_selection)
+        end
+        
+        def backup_selection
+          if selection_mode == ::LibUI::TableSelectionModeZeroOrMany
+            selected_rows = selection&.map { |row| cell_rows[row] }
+          else
+            selected_row = selection && cell_rows[selection]
+          end
+        end
+        
+        def restore_selection(old_selection)
+          if selection_mode == ::LibUI::TableSelectionModeZeroOrMany
+            selected_rows = old_selection
+            self.selection = selected_rows&.map {|row_data| cell_rows.index(row_data) }
+          else
+            selected_row = old_selection
+            self.selection = cell_rows.index(selected_row)
+          end
+        end
+        
       end
     end
   end

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

@@ -126,6 +126,7 @@ module Glimmer
               end
         
               editable table_editable
+              sortable false # TODO disabled for now until we support it correctly in the future
               cell_rows <=> [self, :refined_model_array]
             }
           }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-19 00:00:00.000000000 Z
+date: 2023-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -357,6 +357,8 @@ files:
 - examples/basic_table_image_text3.rb
 - examples/basic_table_progress_bar.rb
 - examples/basic_table_selection.rb
+- examples/basic_table_selection2.rb
+- examples/basic_table_selection3.rb
 - examples/basic_transform.rb
 - examples/basic_transform2.rb
 - examples/basic_window.rb