ruflet_core 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e49bd65682c6c2c9d4ecf2d6ceee66f4e8bb61f4517cd5a4f46506813fa38224
-  data.tar.gz: 0ce49c90eacbaf4aa5c6e17b5a9cbb2a5cc8c5940f13fae91e23bd0288fa9870
+  metadata.gz: 9f384022aa476f52d7aa7e1315e1a5da2e71071cab839f04f7a0331cdb7da21f
+  data.tar.gz: f21fb7e4b2a9f401ef521d278128ac5b436d912182f2d1ddbcbb4b7597f4dfca
 SHA512:
-  metadata.gz: 4067f222985f243e3f067db401241f9f7b20d8693753b9eeabcdbdd4545729094686720c5d37904349f3f9c3bb00cb7bb58dcea422dc11eb0403cd1e4352c37b
-  data.tar.gz: 23bf2a1c2afbd14d9bca577ea5316be156878bbc8c3ad5c0ea42ad91dfed3e07a00f20111342e544fc838c00ae75aeebb6635e1bf0cf58b0b8217e8bf0e05afa
+  metadata.gz: f5ffaad8c7cee45c8b756d66d567e3a9e04c13dbb672dedb3c18545f7ecd6374af89b7267fc715711d73f8dc4b1fe3b9f597f5b62ca2fd9181f7dabb336178da
+  data.tar.gz: b52faf7ed1f6aa8980ba4c03e64c34c6b13760375261ef1e6121cf52eb774c035d8940d5d9cbb74f86de5174a768d758bba724fafa2f48a77aa1bc6a6d726524

data/lib/ruflet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ruflet
-  VERSION = "0.0.12" unless const_defined?(:VERSION)
+  VERSION = "0.0.13" unless const_defined?(:VERSION)
 end

data/lib/ruflet_protocol/ruflet/protocol.rb

@@ -9,6 +9,7 @@ module Ruflet
       update_control: 4,
       invoke_control_method: 5,
       session_crashed: 6,
+      python_output: 7,
 
       # Legacy JSON protocol aliases kept for compatibility.
       register_web_client: "registerWebClient",
@@ -19,7 +20,13 @@ module Ruflet
     module_function
 
     def pack_message(action:, payload:)
-      [action, payload]
+      [action_code(action), payload]
+    end
+
+    def action_code(action)
+      return action if action.is_a?(Integer) || action.is_a?(String)
+
+      ACTIONS.fetch(action)
     end
 
     def normalize_register_payload(payload)
@@ -51,11 +58,50 @@ module Ruflet
       }
     end
 
-    def register_response(session_id:)
+    def normalize_patch_control_payload(payload)
+      {
+        "id" => payload["id"] || payload[:id],
+        "patch" => Array(payload["patch"] || payload[:patch])
+      }
+    end
+
+    def normalize_invoke_method_payload(payload)
+      {
+        "control_id" => payload["control_id"] || payload[:control_id],
+        "call_id" => payload["call_id"] || payload[:call_id],
+        "name" => payload["name"] || payload[:name],
+        "args" => payload.key?("args") ? payload["args"] : payload[:args],
+        "timeout" => payload.key?("timeout") || payload.key?(:timeout) ? (payload["timeout"] || payload[:timeout]) : 10
+      }
+    end
+
+    def normalize_invoke_method_result_payload(payload)
+      {
+        "control_id" => payload["control_id"] || payload[:control_id],
+        "call_id" => payload["call_id"] || payload[:call_id],
+        "result" => payload.key?("result") ? payload["result"] : payload[:result],
+        "error" => payload.key?("error") ? payload["error"] : payload[:error]
+      }
+    end
+
+    def normalize_session_crashed_payload(payload)
+      {
+        "message" => payload["message"] || payload[:message].to_s
+      }
+    end
+
+    def normalize_python_output_payload(payload)
+      {
+        "text" => payload["text"] || payload[:text].to_s,
+        "is_stderr" => payload.key?("is_stderr") || payload.key?(:is_stderr) ? !!(payload["is_stderr"] || payload[:is_stderr]) : false
+      }
+    end
+
+    def register_response(session_id:, page_patch: {}, error: nil)
       {
         "session_id" => session_id,
-        "page_patch" => {},
-        "error" => nil
+        "page_patch" => page_patch,
+        "error" => error
       }
     end
   end

data/lib/ruflet_ui/ruflet/control.rb

@@ -93,7 +93,7 @@ module Ruflet
       when Array
         value.map { |v| serialize_value(v) }
       when Hash
-        value.transform_values { |v| serialize_value(v) }
+        value.each_with_object({}) { |(k, v), result| result[k.to_s] = serialize_value(v) }
       else
         value.respond_to?(:to_h) ? serialize_value(value.to_h) : value
       end
@@ -107,6 +107,8 @@ module Ruflet
       output.keys.each do |key|
         key_string = key.to_s
         next unless key_string.start_with?("on_")
+        next if key_string.end_with?("_hint_text")
+        next if key_string == "on_label_color"
 
         event_name = normalized_event_name(key_string)
         if allowed_events.any? && !allowed_events_set.include?(event_name)
@@ -171,7 +173,7 @@ module Ruflet
     end
 
     def color_prop_key?(key)
-      key == "color" || key == "bgcolor" || key.end_with?("_color")
+      key == "color" || key.end_with?("bgcolor") || key.end_with?("_color")
     end
 
     def normalize_icon_prop(key, value)
@@ -179,6 +181,8 @@ module Ruflet
       return value if value.nil?
       return value if value.is_a?(Ruflet::Control)
       return normalize_icon_name(value.value) if value.is_a?(Ruflet::IconData)
+      return value.map { |item| normalize_icon_prop(key, item) } if value.is_a?(Array)
+      return value.each_with_object({}) { |(k, v), out| out[k] = normalize_icon_prop(key, v) } if value.is_a?(Hash)
       return normalize_icon_name(value.to_s) if value.is_a?(String) || value.is_a?(Symbol)
 
       raise ArgumentError, "#{type} #{key} must use an icon name string, not #{value.inspect}"
@@ -193,7 +197,9 @@ module Ruflet
     end
 
     def icon_prop_key?(key)
-      key == "icon" || key.end_with?("_icon")
+      return false if key.start_with?("show_")
+
+      key == "icon" || key.end_with?("_icon") || key == "leading" || key == "trailing"
     end
 
     def normalized_event_name(event_name)
@@ -213,13 +219,14 @@ module Ruflet
 
     def property_names
       constructor_keywords_for_schema_class
-        .reject { |name| name.to_s.start_with?("on_") }
+        .reject { |name| name.to_s.start_with?("on_") && name != :on_label_color }
         .map(&:to_s)
     end
 
     def event_names
       constructor_keywords_for_schema_class
         .select { |name| name.to_s.start_with?("on_") }
+        .reject { |name| name == :on_label_color }
         .map { |name| name.to_s.sub(/\Aon_/, "") }
     end
 

data/lib/ruflet_ui/ruflet/dsl.rb

@@ -49,57 +49,218 @@ module Ruflet
     def control(type, **props, &block) = _pending_app.control(type, **props, &block)
     def widget(type, **props, &block) = _pending_app.widget(type, **props, &block)
     def service(type, **props, &block) = _pending_app.service(type, **props, &block)
-    def column(**props, &block) = _pending_app.column(**props, &block)
+    def column(children = nil, **props, &block) = _pending_app.column(children, **props, &block)
     def center(**props, &block) = _pending_app.center(**props, &block)
-    def row(**props, &block) = _pending_app.row(**props, &block)
-    def stack(**props, &block) = _pending_app.stack(**props, &block)
-    def grid_view(**props, &block) = _pending_app.grid_view(**props, &block)
-    def gridview(**props, &block) = _pending_app.gridview(**props, &block)
+    def row(children = nil, **props, &block) = _pending_app.row(children, **props, &block)
+    def stack(children = nil, **props, &block) = _pending_app.stack(children, **props, &block)
+    def grid_view(children = nil, **props, &block) = _pending_app.grid_view(children, **props, &block)
+    def gridview(children = nil, **props, &block) = _pending_app.gridview(children, **props, &block)
     def container(**props, &block) = _pending_app.container(**props, &block)
+    def animated_switcher(content = nil, **props) = _pending_app.animated_switcher(content, **props)
+    def animatedswitcher(content = nil, **props) = _pending_app.animatedswitcher(content, **props)
+    def animation(duration = nil, **props) = _pending_app.animation(duration, **props)
+    def animation_style(**props) = _pending_app.animation_style(**props)
+    def audio(**props) = _pending_app.audio(**props)
+    def auto_complete(suggestions = nil, **props) = _pending_app.auto_complete(suggestions, **props)
+    def autocomplete(suggestions = nil, **props) = _pending_app.autocomplete(suggestions, **props)
+    def auto_complete_suggestion(key = nil, **props) = _pending_app.auto_complete_suggestion(key, **props)
+    def autocomplete_suggestion(key = nil, **props) = _pending_app.autocomplete_suggestion(key, **props)
+    def autocompletesuggestion(key = nil, **props) = _pending_app.autocompletesuggestion(key, **props)
+    def context_menu(content = nil, **props) = _pending_app.context_menu(content, **props)
+    def contextmenu(content = nil, **props) = _pending_app.contextmenu(content, **props)
+    def keyboard_listener(content = nil, **props) = _pending_app.keyboard_listener(content, **props)
+    def keyboardlistener(content = nil, **props) = _pending_app.keyboardlistener(content, **props)
     def gesture_detector(**props, &block) = _pending_app.gesture_detector(**props, &block)
     def gesturedetector(**props, &block) = _pending_app.gesturedetector(**props, &block)
-    def draggable(**props, &block) = _pending_app.draggable(**props, &block)
-    def drag_target(**props, &block) = _pending_app.drag_target(**props, &block)
-    def dragtarget(**props, &block) = _pending_app.dragtarget(**props, &block)
+    def canvas(shapes = nil, **props) = _pending_app.canvas(shapes, **props)
+    def line(**props) = _pending_app.line(**props)
+    def circle(**props) = _pending_app.circle(**props)
+    def arc(**props) = _pending_app.arc(**props)
+    def color(**props) = _pending_app.color(**props)
+    def canvas_color(**props) = _pending_app.canvas_color(**props)
+    def fill(**props) = _pending_app.fill(**props)
+    def oval(**props) = _pending_app.oval(**props)
+    def points(**props) = _pending_app.points(**props)
+    def rect(**props) = _pending_app.rect(**props)
+    def path(**props) = _pending_app.path(**props)
+    def shadow(**props) = _pending_app.shadow(**props)
+    def paint(**props) = _pending_app.paint(**props)
+    def path_move_to(x = nil, y = nil, **props) = _pending_app.path_move_to(x, y, **props)
+    def path_line_to(x = nil, y = nil, **props) = _pending_app.path_line_to(x, y, **props)
+    def path_arc(**props) = _pending_app.path_arc(**props)
+    def path_arc_to(**props) = _pending_app.path_arc_to(**props)
+    def path_oval(**props) = _pending_app.path_oval(**props)
+    def path_rect(**props) = _pending_app.path_rect(**props)
+    def path_quadratic_to(**props) = _pending_app.path_quadratic_to(**props)
+    def path_cubic_to(**props) = _pending_app.path_cubic_to(**props)
+    def path_sub_path(**props) = _pending_app.path_sub_path(**props)
+    def path_close(**props) = _pending_app.path_close(**props)
+    def draggable(content = nil, **props, &block) = _pending_app.draggable(content, **props, &block)
+    def dismissible(content = nil, **props) = _pending_app.dismissible(content, **props)
+    def drag_target(content = nil, **props, &block) = _pending_app.drag_target(content, **props, &block)
+    def dragtarget(content = nil, **props, &block) = _pending_app.dragtarget(content, **props, &block)
+    def card(content = nil, **props) = _pending_app.card(content, **props)
+    def list_tile(**props) = _pending_app.list_tile(**props)
+    def listtile(**props) = _pending_app.listtile(**props)
+    def map(layers = nil, **props) = _pending_app.map(layers, **props)
+    def tile_layer(**props) = _pending_app.tile_layer(**props)
+    def tilelayer(**props) = _pending_app.tilelayer(**props)
+    def marker_layer(markers = nil, **props) = _pending_app.marker_layer(markers, **props)
+    def markerlayer(markers = nil, **props) = _pending_app.markerlayer(markers, **props)
+    def marker(content = nil, **props) = _pending_app.marker(content, **props)
+    def circle_layer(circles = nil, **props) = _pending_app.circle_layer(circles, **props)
+    def circlelayer(circles = nil, **props) = _pending_app.circlelayer(circles, **props)
+    def circle_marker(**props) = _pending_app.circle_marker(**props)
+    def circlemarker(**props) = _pending_app.circlemarker(**props)
+    def polyline_layer(polylines = nil, **props) = _pending_app.polyline_layer(polylines, **props)
+    def polylinelayer(polylines = nil, **props) = _pending_app.polylinelayer(polylines, **props)
+    def polyline_marker(**props) = _pending_app.polyline_marker(**props)
+    def polylinemarker(**props) = _pending_app.polylinemarker(**props)
+    def polygon_layer(polygons = nil, **props) = _pending_app.polygon_layer(polygons, **props)
+    def polygonlayer(polygons = nil, **props) = _pending_app.polygonlayer(polygons, **props)
+    def polygon_marker(**props) = _pending_app.polygon_marker(**props)
+    def polygonmarker(**props) = _pending_app.polygonmarker(**props)
+    def simple_attribution(**props) = _pending_app.simple_attribution(**props)
+    def simpleattribution(**props) = _pending_app.simpleattribution(**props)
+    def list_view(children = nil, **props) = _pending_app.list_view(children, **props)
+    def listview(children = nil, **props) = _pending_app.listview(children, **props)
+    def menu_bar(children = nil, **props) = _pending_app.menu_bar(children, **props)
+    def menubar(children = nil, **props) = _pending_app.menubar(children, **props)
+    def menu_item_button(content = nil, **props) = _pending_app.menu_item_button(content, **props)
+    def menuitembutton(content = nil, **props) = _pending_app.menuitembutton(content, **props)
+    def merge_semantics(content = nil, **props) = _pending_app.merge_semantics(content, **props)
+    def mergesemantics(content = nil, **props) = _pending_app.mergesemantics(content, **props)
+    def submenu_button(children = nil, **props) = _pending_app.submenu_button(children, **props)
+    def submenubutton(children = nil, **props) = _pending_app.submenubutton(children, **props)
+    def divider(**props) = _pending_app.divider(**props)
+    def vertical_divider(**props) = _pending_app.vertical_divider(**props)
+    def verticaldivider(**props) = _pending_app.verticaldivider(**props)
+    def window_drag_area(content = nil, **props) = _pending_app.window_drag_area(content, **props)
+    def windowdragarea(content = nil, **props) = _pending_app.windowdragarea(content, **props)
+    def date_picker(**props) = _pending_app.date_picker(**props)
+    def datepicker(**props) = _pending_app.datepicker(**props)
+    def date_range_picker(**props) = _pending_app.date_range_picker(**props)
+    def daterangepicker(**props) = _pending_app.daterangepicker(**props)
+    def data_table(columns = nil, **props) = _pending_app.data_table(columns, **props)
+    def datatable(columns = nil, **props) = _pending_app.datatable(columns, **props)
+    def data_column(label = nil, **props) = _pending_app.data_column(label, **props)
+    def datacolumn(label = nil, **props) = _pending_app.datacolumn(label, **props)
+    def data_row(cells = nil, **props) = _pending_app.data_row(cells, **props)
+    def datarow(cells = nil, **props) = _pending_app.datarow(cells, **props)
+    def data_cell(content = nil, **props) = _pending_app.data_cell(content, **props)
+    def datacell(content = nil, **props) = _pending_app.datacell(content, **props)
+    def expansion_tile(children = nil, **props) = _pending_app.expansion_tile(children, **props)
+    def expansiontile(children = nil, **props) = _pending_app.expansiontile(children, **props)
+    def expansion_panel(**props) = _pending_app.expansion_panel(**props)
+    def expansionpanel(**props) = _pending_app.expansionpanel(**props)
+    def expansion_panel_list(children = nil, **props) = _pending_app.expansion_panel_list(children, **props)
+    def expansionpanellist(children = nil, **props) = _pending_app.expansionpanellist(children, **props)
+    def dropdown(options = nil, **props) = _pending_app.dropdown(options, **props)
+    def dropdown_option(key = nil, **props) = _pending_app.dropdown_option(key, **props)
+    def dropdownoption(key = nil, **props) = _pending_app.dropdownoption(key, **props)
+    def dropdown_m2(options = nil, **props) = _pending_app.dropdown_m2(options, **props)
+    def dropdownm2(options = nil, **props) = _pending_app.dropdownm2(options, **props)
+    def progress_bar(**props) = _pending_app.progress_bar(**props)
+    def progressbar(**props) = _pending_app.progressbar(**props)
+    def placeholder(content = nil, **props) = _pending_app.placeholder(content, **props)
+    def page_view(children = nil, **props) = _pending_app.page_view(children, **props)
+    def pageview(children = nil, **props) = _pending_app.pageview(children, **props)
+    def progress_ring(**props) = _pending_app.progress_ring(**props)
+    def progressring(**props) = _pending_app.progressring(**props)
+    def range_slider(**props) = _pending_app.range_slider(**props)
+    def rangeslider(**props) = _pending_app.rangeslider(**props)
+    def responsive_row(children = nil, **props, &block) = _pending_app.responsive_row(children, **props, &block)
+    def responsiverow(children = nil, **props, &block) = _pending_app.responsiverow(children, **props, &block)
+    def reorderable_drag_handle(content = nil, **props) = _pending_app.reorderable_drag_handle(content, **props)
+    def reorderabledraghandle(content = nil, **props) = _pending_app.reorderabledraghandle(content, **props)
+    def reorderable_list_view(children = nil, **props) = _pending_app.reorderable_list_view(children, **props)
+    def reorderablelistview(children = nil, **props) = _pending_app.reorderablelistview(children, **props)
+    def safe_area(content = nil, **props) = _pending_app.safe_area(content, **props)
+    def safearea(content = nil, **props) = _pending_app.safearea(content, **props)
+    def segment(value = nil, **props) = _pending_app.segment(value, **props)
+    def segmented_button(segments = nil, **props) = _pending_app.segmented_button(segments, **props)
+    def segmentedbutton(segments = nil, **props) = _pending_app.segmentedbutton(segments, **props)
+    def selection_area(content = nil, **props) = _pending_app.selection_area(content, **props)
+    def selectionarea(content = nil, **props) = _pending_app.selectionarea(content, **props)
+    def search_bar(children = nil, **props) = _pending_app.search_bar(children, **props)
+    def searchbar(children = nil, **props) = _pending_app.searchbar(children, **props)
+    def semantics(content = nil, **props) = _pending_app.semantics(content, **props)
+    def time_picker(**props) = _pending_app.time_picker(**props)
+    def timepicker(**props) = _pending_app.timepicker(**props)
+    def badge(label = nil, **props) = _pending_app.badge(label, **props)
+    def chip(label = nil, **props) = _pending_app.chip(label, **props)
+    def circle_avatar(content = nil, **props) = _pending_app.circle_avatar(content, **props)
+    def circleavatar(content = nil, **props) = _pending_app.circleavatar(content, **props)
+    def banner(content = nil, **props) = _pending_app.banner(content, **props)
+    def bottom_app_bar(content = nil, **props) = _pending_app.bottom_app_bar(content, **props)
+    def bottomappbar(content = nil, **props) = _pending_app.bottomappbar(content, **props)
     def text(value = nil, **props) = _pending_app.text(value, **props)
-    def button(**props) = _pending_app.button(**props)
-    def elevated_button(**props) = _pending_app.elevated_button(**props)
-    def text_field(**props) = _pending_app.text_field(**props)
-    def textfield(**props) = _pending_app.textfield(**props)
-    def icon(**props) = _pending_app.icon(**props)
+    def button(content = nil, **props) = _pending_app.button(content, **props)
+    def elevated_button(content = nil, **props) = _pending_app.elevated_button(content, **props)
+    def text_field(value = nil, **props) = _pending_app.text_field(value, **props)
+    def textfield(value = nil, **props) = _pending_app.textfield(value, **props)
+    def icon(icon = nil, **props) = _pending_app.icon(icon, **props)
     def image(src = nil, **props) = _pending_app.image(src, **props)
-    def icon_button(**props) = _pending_app.icon_button(**props)
-    def iconbutton(**props) = _pending_app.iconbutton(**props)
+    def icon_button(icon = nil, **props) = _pending_app.icon_button(icon, **props)
+    def iconbutton(icon = nil, **props) = _pending_app.iconbutton(icon, **props)
+    def interactive_viewer(content = nil, **props) = _pending_app.interactive_viewer(content, **props)
+    def interactiveviewer(content = nil, **props) = _pending_app.interactiveviewer(content, **props)
+    def popup_menu_button(items = nil, **props) = _pending_app.popup_menu_button(items, **props)
+    def popupmenubutton(items = nil, **props) = _pending_app.popupmenubutton(items, **props)
+    def popup_menu_item(content = nil, **props) = _pending_app.popup_menu_item(content, **props)
+    def popupmenuitem(content = nil, **props) = _pending_app.popupmenuitem(content, **props)
     def app_bar(**props) = _pending_app.app_bar(**props)
     def appbar(**props) = _pending_app.appbar(**props)
     def clipboard(**props) = _pending_app.clipboard(**props)
-    def text_button(**props) = _pending_app.text_button(**props)
-    def textbutton(**props) = _pending_app.textbutton(**props)
-    def filled_button(**props) = _pending_app.filled_button(**props)
-    def filledbutton(**props) = _pending_app.filledbutton(**props)
+    def text_button(content = nil, **props) = _pending_app.text_button(content, **props)
+    def textbutton(content = nil, **props) = _pending_app.textbutton(content, **props)
+    def filled_button(content = nil, **props) = _pending_app.filled_button(content, **props)
+    def filledbutton(content = nil, **props) = _pending_app.filledbutton(content, **props)
+    def filled_icon_button(icon = nil, **props) = _pending_app.filled_icon_button(icon, **props)
+    def fillediconbutton(icon = nil, **props) = _pending_app.fillediconbutton(icon, **props)
+    def filled_tonal_button(content = nil, **props) = _pending_app.filled_tonal_button(content, **props)
+    def filledtonalbutton(content = nil, **props) = _pending_app.filledtonalbutton(content, **props)
+    def filled_tonal_icon_button(icon = nil, **props) = _pending_app.filled_tonal_icon_button(icon, **props)
+    def filledtonaliconbutton(icon = nil, **props) = _pending_app.filledtonaliconbutton(icon, **props)
+    def outlined_button(content = nil, **props) = _pending_app.outlined_button(content, **props)
+    def outlinedbutton(content = nil, **props) = _pending_app.outlinedbutton(content, **props)
+    def outlined_icon_button(icon = nil, **props) = _pending_app.outlined_icon_button(icon, **props)
+    def outlinediconbutton(icon = nil, **props) = _pending_app.outlinediconbutton(icon, **props)
     def checkbox(**props) = _pending_app.checkbox(**props)
+    def switch(**props) = _pending_app.switch(**props)
+    def slider(**props) = _pending_app.slider(**props)
+    def transparent_pointer(content = nil, **props) = _pending_app.transparent_pointer(content, **props)
+    def transparentpointer(content = nil, **props) = _pending_app.transparentpointer(content, **props)
     def radio(**props) = _pending_app.radio(**props)
-    def radio_group(**props) = _pending_app.radio_group(**props)
-    def radiogroup(**props) = _pending_app.radiogroup(**props)
+    def radio_group(content = nil, **props) = _pending_app.radio_group(content, **props)
+    def radiogroup(content = nil, **props) = _pending_app.radiogroup(content, **props)
     def alert_dialog(**props) = _pending_app.alert_dialog(**props)
     def alertdialog(**props) = _pending_app.alertdialog(**props)
-    def snack_bar(**props) = _pending_app.snack_bar(**props)
-    def snackbar(**props) = _pending_app.snackbar(**props)
-    def bottom_sheet(**props) = _pending_app.bottom_sheet(**props)
-    def bottomsheet(**props) = _pending_app.bottomsheet(**props)
+    def snack_bar(content = nil, **props) = _pending_app.snack_bar(content, **props)
+    def snackbar(content = nil, **props) = _pending_app.snackbar(content, **props)
+    def bottom_sheet(content = nil, **props) = _pending_app.bottom_sheet(content, **props)
+    def bottomsheet(content = nil, **props) = _pending_app.bottomsheet(content, **props)
     def markdown(value = nil, **props) = _pending_app.markdown(value, **props)
     def floating_action_button(**props) = _pending_app.floating_action_button(**props)
     def floatingactionbutton(**props) = _pending_app.floatingactionbutton(**props)
-    def tabs(**props, &block) = _pending_app.tabs(**props, &block)
-    def tab(**props, &block) = _pending_app.tab(**props, &block)
-    def tab_bar(**props, &block) = _pending_app.tab_bar(**props, &block)
-    def tabbar(**props, &block) = _pending_app.tabbar(**props, &block)
-    def tab_bar_view(**props, &block) = _pending_app.tab_bar_view(**props, &block)
-    def tabbarview(**props, &block) = _pending_app.tabbarview(**props, &block)
+    def tabs(content = nil, **props, &block) = _pending_app.tabs(content, **props, &block)
+    def tab(label = nil, **props, &block) = _pending_app.tab(label, **props, &block)
+    def tab_bar(tabs = nil, **props, &block) = _pending_app.tab_bar(tabs, **props, &block)
+    def tabbar(tabs = nil, **props, &block) = _pending_app.tabbar(tabs, **props, &block)
+    def tab_bar_view(children = nil, **props, &block) = _pending_app.tab_bar_view(children, **props, &block)
+    def tabbarview(children = nil, **props, &block) = _pending_app.tabbarview(children, **props, &block)
     def navigation_bar(**props, &block) = _pending_app.navigation_bar(**props, &block)
     def navigationbar(**props, &block) = _pending_app.navigationbar(**props, &block)
     def navigation_bar_destination(**props, &block) = _pending_app.navigation_bar_destination(**props, &block)
     def navigationbardestination(**props, &block) = _pending_app.navigationbardestination(**props, &block)
+    def navigation_rail(**props, &block) = _pending_app.navigation_rail(**props, &block)
+    def navigationrail(**props, &block) = _pending_app.navigationrail(**props, &block)
+    def navigation_rail_destination(**props, &block) = _pending_app.navigation_rail_destination(**props, &block)
+    def navigationraildestination(**props, &block) = _pending_app.navigationraildestination(**props, &block)
+    def navigation_drawer(children = nil, **props) = _pending_app.navigation_drawer(children, **props)
+    def navigationdrawer(children = nil, **props) = _pending_app.navigationdrawer(children, **props)
+    def navigation_drawer_destination(**props) = _pending_app.navigation_drawer_destination(**props)
+    def navigationdrawerdestination(**props) = _pending_app.navigationdrawerdestination(**props)
     def bar_chart(**props) = _pending_app.bar_chart(**props)
     def barchart(**props) = _pending_app.barchart(**props)
     def bar_chart_group(**props) = _pending_app.bar_chart_group(**props)
@@ -140,25 +301,56 @@ module Ruflet
     def chartaxislabel(**props) = _pending_app.chartaxislabel(**props)
     def web_view(**props) = _pending_app.web_view(**props)
     def webview(**props) = _pending_app.webview(**props)
+    def video(**props) = _pending_app.video(**props)
     def fab(content = nil, **props) = _pending_app.fab(content, **props)
-    def cupertino_button(**props) = _pending_app.cupertino_button(**props)
-    def cupertinobutton(**props) = _pending_app.cupertinobutton(**props)
-    def cupertino_filled_button(**props) = _pending_app.cupertino_filled_button(**props)
-    def cupertinofilledbutton(**props) = _pending_app.cupertinofilledbutton(**props)
-    def cupertino_text_field(**props) = _pending_app.cupertino_text_field(**props)
-    def cupertinotextfield(**props) = _pending_app.cupertinotextfield(**props)
+    def cupertino_button(content = nil, **props) = _pending_app.cupertino_button(content, **props)
+    def cupertinobutton(content = nil, **props) = _pending_app.cupertinobutton(content, **props)
+    def cupertino_filled_button(content = nil, **props) = _pending_app.cupertino_filled_button(content, **props)
+    def cupertinofilledbutton(content = nil, **props) = _pending_app.cupertinofilledbutton(content, **props)
+    def cupertino_tinted_button(content = nil, **props) = _pending_app.cupertino_tinted_button(content, **props)
+    def cupertinotintedbutton(content = nil, **props) = _pending_app.cupertinotintedbutton(content, **props)
+    def cupertino_checkbox(**props) = _pending_app.cupertino_checkbox(**props)
+    def cupertinocheckbox(**props) = _pending_app.cupertinocheckbox(**props)
+    def cupertino_text_field(value = nil, **props) = _pending_app.cupertino_text_field(value, **props)
+    def cupertinotextfield(value = nil, **props) = _pending_app.cupertinotextfield(value, **props)
+    def cupertino_timer_picker(**props) = _pending_app.cupertino_timer_picker(**props)
+    def cupertinotimerpicker(**props) = _pending_app.cupertinotimerpicker(**props)
     def cupertino_switch(**props) = _pending_app.cupertino_switch(**props)
     def cupertinoswitch(**props) = _pending_app.cupertinoswitch(**props)
     def cupertino_slider(**props) = _pending_app.cupertino_slider(**props)
     def cupertinoslider(**props) = _pending_app.cupertinoslider(**props)
+    def cupertino_radio(**props) = _pending_app.cupertino_radio(**props)
+    def cupertinoradio(**props) = _pending_app.cupertinoradio(**props)
     def cupertino_alert_dialog(**props) = _pending_app.cupertino_alert_dialog(**props)
     def cupertinoalertdialog(**props) = _pending_app.cupertinoalertdialog(**props)
     def cupertino_action_sheet(**props) = _pending_app.cupertino_action_sheet(**props)
     def cupertinoactionsheet(**props) = _pending_app.cupertinoactionsheet(**props)
+    def cupertino_action_sheet_action(**props) = _pending_app.cupertino_action_sheet_action(**props)
+    def cupertinoactionsheetaction(**props) = _pending_app.cupertinoactionsheetaction(**props)
+    def cupertino_activity_indicator(**props) = _pending_app.cupertino_activity_indicator(**props)
+    def cupertinoactivityindicator(**props) = _pending_app.cupertinoactivityindicator(**props)
+    def cupertino_app_bar(**props) = _pending_app.cupertino_app_bar(**props)
+    def cupertinoappbar(**props) = _pending_app.cupertinoappbar(**props)
+    def cupertino_bottom_sheet(content = nil, **props) = _pending_app.cupertino_bottom_sheet(content, **props)
+    def cupertinobottomsheet(content = nil, **props) = _pending_app.cupertinobottomsheet(content, **props)
+    def cupertino_date_picker(**props) = _pending_app.cupertino_date_picker(**props)
+    def cupertinodatepicker(**props) = _pending_app.cupertinodatepicker(**props)
     def cupertino_dialog_action(**props) = _pending_app.cupertino_dialog_action(**props)
     def cupertinodialogaction(**props) = _pending_app.cupertinodialogaction(**props)
+    def cupertino_context_menu(**props) = _pending_app.cupertino_context_menu(**props)
+    def cupertinocontextmenu(**props) = _pending_app.cupertinocontextmenu(**props)
+    def cupertino_context_menu_action(**props) = _pending_app.cupertino_context_menu_action(**props)
+    def cupertinocontextmenuaction(**props) = _pending_app.cupertinocontextmenuaction(**props)
+    def cupertino_list_tile(**props) = _pending_app.cupertino_list_tile(**props)
+    def cupertinolisttile(**props) = _pending_app.cupertinolisttile(**props)
     def cupertino_navigation_bar(**props) = _pending_app.cupertino_navigation_bar(**props)
     def cupertinonavigationbar(**props) = _pending_app.cupertinonavigationbar(**props)
+    def cupertino_picker(children = nil, **props) = _pending_app.cupertino_picker(children, **props)
+    def cupertinopicker(children = nil, **props) = _pending_app.cupertinopicker(children, **props)
+    def cupertino_segmented_button(children = nil, **props) = _pending_app.cupertino_segmented_button(children, **props)
+    def cupertinosegmentedbutton(children = nil, **props) = _pending_app.cupertinosegmentedbutton(children, **props)
+    def cupertino_sliding_segmented_button(children = nil, **props) = _pending_app.cupertino_sliding_segmented_button(children, **props)
+    def cupertinoslidingsegmentedbutton(children = nil, **props) = _pending_app.cupertinoslidingsegmentedbutton(children, **props)
     def duration(**parts) = duration_in_milliseconds(parts)
 
     class App

data/lib/ruflet_ui/ruflet/events/gesture_events.rb

@@ -15,6 +15,16 @@ module Ruflet
         UI::Types::Offset.from_wire(pick(data, short, long))
       end
 
+      def self.offset_pair(data, x_key, y_key)
+        return nil unless data.is_a?(Hash)
+
+        x = data[x_key] || data[x_key.to_sym]
+        y = data[y_key] || data[y_key.to_sym]
+        return nil if x.nil? || y.nil?
+
+        UI::Types::Offset.new(x: x, y: y)
+      end
+
       def self.duration(data, short, long)
         UI::Types::Duration.from_wire(pick(data, short, long))
       end
@@ -38,7 +48,7 @@ module Ruflet
         raw = data.is_a?(Hash) ? stringify_keys(data) : data
         value =
           if raw.is_a?(Hash)
-            raw["value"] || raw["v"] || raw["data"] || raw["state"]
+            raw["value"] || raw["v"] || raw["data"] || raw["state"] || raw["route"]
           else
             raw
           end
@@ -53,12 +63,101 @@ module Ruflet
     class ClickEvent < GenericEvent; end
     class SubmitEvent < GenericEvent; end
     class SelectEvent < GenericEvent; end
-    class DismissEvent < GenericEvent; end
+    class DismissEvent < GenericEvent
+      attr_reader :direction
+
+      def initialize(raw:, value: nil, direction: nil)
+        super(raw: raw, value: value)
+        @direction = direction
+      end
+
+      def self.from_data(data)
+        raw = data.is_a?(Hash) ? stringify_keys(data) : {}
+        direction = raw["direction"] || raw["d"]
+        new(raw: raw, value: direction || raw["value"] || raw["v"], direction: direction)
+      end
+    end
     class VisibleEvent < GenericEvent; end
     class ResultEvent < GenericEvent; end
     class UploadEvent < GenericEvent; end
     class ErrorEvent < GenericEvent; end
     class ActionEvent < GenericEvent; end
+    class AutoCompleteSelectEvent < GenericEvent
+      attr_reader :selection
+
+      def initialize(raw:, value: nil, selection: nil)
+        super(raw: raw, value: value)
+        @selection = selection
+      end
+
+      def self.from_data(data)
+        raw = data.is_a?(Hash) ? stringify_keys(data) : {}
+        selection = raw["selection"]
+        selection = stringify_keys(selection) if selection.is_a?(Hash)
+        value = raw["value"] || raw["v"] || (selection.is_a?(Hash) ? selection["value"] : nil)
+        new(raw: raw, value: value, selection: selection)
+      end
+    end
+    class ReorderEvent < GenericEvent
+      attr_reader :old_index, :new_index
+
+      def initialize(raw:, old_index:, new_index:)
+        super(raw: raw, value: [old_index, new_index])
+        @old_index = old_index
+        @new_index = new_index
+      end
+
+      def self.from_data(data)
+        raw = data.is_a?(Hash) ? stringify_keys(data) : {}
+        new(
+          raw: raw,
+          old_index: raw["old_index"] || raw["old"],
+          new_index: raw["new_index"] || raw["new"]
+        )
+      end
+    end
+    class DismissibleUpdateEvent < GenericEvent
+      attr_reader :direction, :progress, :reached
+
+      def initialize(raw:, direction:, progress:, reached:)
+        super(raw: raw, value: progress)
+        @direction = direction
+        @progress = progress
+        @reached = reached
+      end
+
+      def self.from_data(data)
+        raw = data.is_a?(Hash) ? stringify_keys(data) : {}
+        new(
+          raw: raw,
+          direction: raw["direction"] || raw["d"],
+          progress: raw["progress"] || raw["p"] || raw["value"] || raw["v"],
+          reached: raw["reached"] || raw["r"]
+        )
+      end
+    end
+    class DragTargetEvent < GenericEvent
+      attr_reader :src_id, :accept, :x, :y
+
+      def initialize(raw:, src_id:, accept: nil, x: nil, y: nil)
+        super(raw: raw, value: src_id)
+        @src_id = src_id
+        @accept = accept
+        @x = x
+        @y = y
+      end
+
+      def self.from_data(data)
+        raw = data.is_a?(Hash) ? stringify_keys(data) : {}
+        new(
+          raw: raw,
+          src_id: raw["src_id"] || raw["src"] || raw["value"] || raw["v"],
+          accept: raw["accept"] || raw["a"],
+          x: raw["x"],
+          y: raw["y"]
+        )
+      end
+    end
     class StateChangeEvent < GenericEvent
       attr_reader :state
 
@@ -86,8 +185,8 @@ module Ruflet
       def self.from_data(data)
         new(
           kind: pick(data, "k", "kind"),
-          local_position: offset(data, "l", "local_position"),
-          global_position: offset(data, "g", "global_position")
+          local_position: offset(data, "l", "local_position") || offset_pair(data, "lx", "ly"),
+          global_position: offset(data, "g", "global_position") || offset_pair(data, "gx", "gy")
         )
       end
     end
@@ -445,13 +544,17 @@ module Ruflet
         "blur" => BlurEvent,
         "click" => ClickEvent,
         "submit" => SubmitEvent,
-        "select" => SelectEvent,
+        "select" => AutoCompleteSelectEvent,
+        "select_change" => GenericEvent,
         "dismiss" => DismissEvent,
         "visible" => VisibleEvent,
         "result" => ResultEvent,
         "upload" => UploadEvent,
         "error" => ErrorEvent,
         "action" => ActionEvent,
+        "reorder" => ReorderEvent,
+        "reorder_start" => ReorderEvent,
+        "reorder_end" => ReorderEvent,
         "state_change" => StateChangeEvent,
         "confirm_pop" => GenericEvent,
         "route_change" => GenericEvent,
@@ -464,11 +567,12 @@ module Ruflet
         "resize" => GenericEvent,
         "load" => GenericEvent,
         "loaded" => GenericEvent,
-        "accept" => GenericEvent,
-        "will_accept" => GenericEvent,
+        "update" => DismissibleUpdateEvent,
+        "accept" => DragTargetEvent,
+        "will_accept" => DragTargetEvent,
         "accept_with_details" => GenericEvent,
-        "move" => GenericEvent,
-        "leave" => GenericEvent,
+        "move" => DragTargetEvent,
+        "leave" => DragTargetEvent,
         "open" => GenericEvent,
         "close" => GenericEvent,
         "double_tap" => GenericEvent,