ruflet_core 0.0.21 → 0.0.23

data/lib/ruflet_ui/ruflet/page.rb

@@ -178,6 +178,8 @@ module Ruflet
       @page_event_handlers = {}
       @view_props = {}
       @page_props = { "route" => (client_details["route"] || "/") }
+      @published_control_states = {}
+      @published_shell_state = nil
       @window = build_client_window(client_details["window"])
       @page_props["window"] = @window
       @overlay_container = Ruflet::Control.new(
@@ -229,6 +231,18 @@ module Ruflet
       @page_props["route"] = value
     end
 
+    # A resumed Page keeps its Ruby controls and event handlers, but a newly
+    # connected client has not mounted any of that state yet. Invalidate only
+    # the client-side publication snapshot so the next update sends the full
+    # page shell, including the internal overlay, dialog, and service roots.
+    def prepare_for_reconnect!
+      @overlay_container_mounted = false
+      @dialogs_container_mounted = false
+      @services_container_mounted = false
+      @published_shell_state = nil
+      self
+    end
+
     def vertical_alignment
       @page_props["vertical_alignment"] || @view_props["vertical_alignment"]
     end
@@ -313,6 +327,7 @@ module Ruflet
       @overlay_container_mounted = true if @overlay_container.wire_id
       @dialogs_container_mounted = true if @dialogs_container.wire_id
       @services_container_mounted = true if @services_container.wire_id
+      capture_published_wire_state!
       patch
     end
 
@@ -1281,7 +1296,7 @@ module Ruflet
 
     def update(control_or_id = nil, **props)
       if control_or_id.nil? && props.empty?
-        send_view_patch
+        send_changed_control_patches
         return self
       end
 
@@ -1310,8 +1325,10 @@ module Ruflet
 
       # Keep runtime control tree aligned with incremental patches.
       if patch.key?("controls")
+        replacement_controls = Array(patch["controls"]).dup
         control.children.clear
-        Array(patch["controls"]).each { |child| control.children << child if child.is_a?(Control) }
+        replacement_controls.each { |child| control.children << child if child.is_a?(Control) }
+        patch["controls"] = replacement_controls
       end
 
       visited = Set.new
@@ -1323,6 +1340,7 @@ module Ruflet
         "id" => wire_id,
         "patch" => [[0], *patch_ops]
       })
+      capture_published_control_tree!(control)
 
       self
     end
@@ -1336,11 +1354,24 @@ module Ruflet
     end
 
     def apply_client_update(control_or_id, props)
+      if page_control_target?(control_or_id)
+        patch = normalize_props(props || {})
+        @client_details.merge!(patch)
+        # These are live client measurements. Keep the page getters current as
+        # well, without consuming route changes before their event is dispatched.
+        %w[width height platform_brightness media].each do |key|
+          @page_props[key] = patch[key] if patch.key?(key)
+        end
+        capture_published_shell_state!
+        return self
+      end
+
       control = resolve_control(control_or_id)
       return self unless control
 
       patch = normalize_props(props || {})
       patch.each { |k, v| control.props[k] = v }
+      capture_published_control_tree!(control)
 
       remove_dialog_tracking(control) if patch.key?("open") && patch["open"] == false
 
@@ -1353,6 +1384,7 @@ module Ruflet
           route_from_event = extract_route(data)
           return if route_from_event && route_from_event == @page_props["route"]
           @page_props["route"] = route_from_event if route_from_event
+          capture_published_shell_state!
         end
         dispatch_page_event(name: name, data: data)
         return
@@ -1362,7 +1394,13 @@ module Ruflet
       return unless control
 
       event = Event.new(name: name, target: target, raw_data: data, page: self, control: control)
-      apply_event_value_to_control(control, event) if %w[change select select_change].include?(name.to_s)
+      if %w[change select select_change].include?(name.to_s)
+        apply_event_value_to_control(control, event)
+        # The client already owns this value. Treat it as published before the
+        # handler runs so a later bare page.update only sends application-side
+        # mutations, not the value that originated on the client.
+        capture_published_control_tree!(control)
+      end
       control.emit(name, event)
 
       if name.to_s == "dismiss" && remove_dialog_tracking(control)
@@ -1533,6 +1571,202 @@ module Ruflet
       @sender.call(action, payload)
     end
 
+    # Bare page.update is the public commit point for direct mutations such as
+    # `list.children.replace(...)`. Keep a shallow, immutable wire snapshot of
+    # every mounted control so the commit can target only controls whose own
+    # properties or child references changed. Descendant contents are tracked
+    # independently: changing a Text value patches the Text, while replacing a
+    # Column's children patches the Column.
+    def send_changed_control_patches
+      refresh_control_indexes!
+      current = build_wire_state_snapshot
+
+      # Navigation, root controls, and page/view chrome are page-owned rather
+      # than regular mounted controls. Retain the complete view patch as the
+      # safe fallback whenever that shell changes.
+      if @published_shell_state.nil? || current[:shell] != @published_shell_state
+        send_view_patch
+        return
+      end
+
+      dirty_ids = current[:controls].each_with_object(Set.new) do |(wire_id, entry), dirty|
+        prior = @published_control_states[wire_id]
+        dirty << wire_id if prior && prior != entry[:state]
+      end
+
+      # A changed parent patch serializes its newly referenced children, so a
+      # second patch for a dirty descendant would be redundant and can race the
+      # parent's replacement on the client.
+      targets = dirty_ids.reject do |wire_id|
+        ancestor = current[:parents][wire_id]
+        found = false
+        while ancestor
+          if dirty_ids.include?(ancestor)
+            found = true
+            break
+          end
+          ancestor = current[:parents][ancestor]
+        end
+        found
+      end
+
+      targets.each do |wire_id|
+        entry = current[:controls][wire_id]
+        patch_ops = changed_control_patch_ops(
+          entry[:control],
+          @published_control_states.fetch(wire_id),
+          entry[:state]
+        )
+        next if patch_ops.empty?
+
+        send_message(Protocol::ACTIONS[:patch_control], {
+          "id" => wire_id,
+          "patch" => [[0], *patch_ops]
+        })
+      end
+
+      publish_wire_state_snapshot!(current)
+    end
+
+    def changed_control_patch_ops(control, prior, current)
+      operations = []
+      prior_props = prior.fetch("props")
+      current_props = current.fetch("props")
+
+      (prior_props.keys | current_props.keys).each do |key|
+        next if prior_props[key] == current_props[key]
+
+        value = control.props.key?(key) ? control.props[key] : nil
+        operations << [0, 0, key, serialize_patch_value(value)]
+      end
+
+      if prior.fetch("children") != current.fetch("children")
+        operations << [0, 0, "controls", serialize_patch_value(control.children)]
+      end
+      operations
+    end
+
+    def build_wire_state_snapshot
+      controls = {}
+      parents = {}
+      visited = Set.new
+
+      roots = @views.any? ? @views : @root_controls
+      roots.each { |control| collect_control_wire_state(control, nil, controls, parents, visited) }
+      unless @views.any?
+        @view_props.each_value do |value|
+          collect_embedded_wire_state(value, nil, controls, parents, visited)
+        end
+      end
+      @page_props.each_value do |value|
+        collect_embedded_wire_state(value, nil, controls, parents, visited)
+      end
+
+      {
+        controls: controls,
+        parents: parents,
+        shell: current_shell_wire_state
+      }
+    end
+
+    def collect_control_wire_state(control, parent_id, controls, parents, visited)
+      return unless control
+      return if visited.include?(control.object_id)
+
+      visited << control.object_id
+      wire_id = control.wire_id
+      return unless wire_id
+
+      parents[wire_id] = parent_id if parent_id
+      controls[wire_id] = {
+        control: control,
+        state: control_local_wire_state(control)
+      }
+      control.children.each do |child|
+        collect_control_wire_state(child, wire_id, controls, parents, visited)
+      end
+      control.props.each_value do |value|
+        collect_embedded_wire_state(value, wire_id, controls, parents, visited)
+      end
+    end
+
+    def collect_embedded_wire_state(value, parent_id, controls, parents, visited)
+      case value
+      when Control
+        collect_control_wire_state(value, parent_id, controls, parents, visited)
+      when Array
+        value.each do |entry|
+          collect_embedded_wire_state(entry, parent_id, controls, parents, visited)
+        end
+      when Hash
+        value.each_value do |entry|
+          collect_embedded_wire_state(entry, parent_id, controls, parents, visited)
+        end
+      end
+    end
+
+    def control_local_wire_state(control)
+      {
+        "type" => control.type,
+        "props" => comparison_wire_value(control.props),
+        "children" => control.children.map(&:wire_id)
+      }
+    end
+
+    def current_shell_wire_state
+      {
+        "mode" => (@views.any? ? "views" : "implicit_view"),
+        "roots" => (@views.any? ? @views : @root_controls).map(&:wire_id),
+        "view_props" => comparison_wire_value(@view_props),
+        "page_props" => comparison_wire_value(@page_props)
+      }
+    end
+
+    # Controls are references in their parent's local state. Their contents
+    # are deliberately excluded and tracked under their own wire IDs.
+    def comparison_wire_value(value)
+      case value
+      when Control
+        [Control, value.wire_id]
+      when Array
+        value.map { |entry| comparison_wire_value(entry) }
+      when Hash
+        value.each_with_object({}) do |(key, entry), result|
+          result[key] = comparison_wire_value(entry)
+        end
+      when String
+        value.dup
+      else
+        begin
+          value.dup
+        rescue TypeError
+          value
+        end
+      end
+    end
+
+    def capture_published_wire_state!
+      publish_wire_state_snapshot!(build_wire_state_snapshot)
+    end
+
+    def publish_wire_state_snapshot!(snapshot)
+      @published_control_states = snapshot[:controls].transform_values { |entry| entry[:state] }
+      @published_shell_state = snapshot[:shell]
+    end
+
+    def capture_published_control_tree!(control)
+      controls = {}
+      parents = {}
+      collect_control_wire_state(control, nil, controls, parents, Set.new)
+      controls.each do |wire_id, entry|
+        @published_control_states[wire_id] = entry[:state]
+      end
+    end
+
+    def capture_published_shell_state!
+      @published_shell_state = current_shell_wire_state if @published_shell_state
+    end
+
     def replace_root_controls(controls)
       visited = Set.new
       controls.each { |control| register_control_tree(control, visited) }
@@ -1559,6 +1793,7 @@ module Ruflet
       @overlay_container_mounted = true if @overlay_container.wire_id
       @dialogs_container_mounted = true if @dialogs_container.wire_id
       @services_container_mounted = true if @services_container.wire_id
+      capture_published_wire_state!
     end
 
     def register_control_tree(control, visited = Set.new)
@@ -1778,6 +2013,7 @@ module Ruflet
           "id" => @overlay_container.wire_id,
           "patch" => [[0], [0, 0, "controls", serialize_patch_value(@overlay_container.children)]]
         })
+        capture_published_control_tree!(@overlay_container)
       else
         send_view_patch
       end
@@ -1795,6 +2031,7 @@ module Ruflet
           "id" => @services_container.wire_id,
           "patch" => [[0], [0, 0, "_services", serialize_patch_value(@services_container.props["_services"])]]
         })
+        capture_published_control_tree!(@services_container)
       else
         send_view_patch
       end
@@ -1808,6 +2045,7 @@ module Ruflet
           "id" => @dialogs_container.wire_id,
           "patch" => [[0], [0, 0, "controls", serialize_patch_value(@dialogs_container.props["controls"])]]
         })
+        capture_published_control_tree!(@dialogs_container)
       else
         send_view_patch
       end
@@ -1841,7 +2079,7 @@ module Ruflet
     end
 
     def assign_split_prop(key, value)
-      if key == "vertical_alignment" || key == "horizontal_alignment"
+      if key == "vertical_alignment" || key == "horizontal_alignment" || key == "scroll"
         @page_props[key] = value
         @view_props[key] = value
       elsif DIALOG_PROP_KEYS.include?(key)

data/lib/ruflet_ui/ruflet/ui/control_factory.rb

@@ -2,6 +2,7 @@
 
 require_relative "controls/ruflet_controls"
 require_relative "services/ruflet_services"
+require_relative "platform_control_contracts"
 require_relative "../control"
 
 module Ruflet
@@ -12,6 +13,7 @@ module Ruflet
       CLASS_MAP =
         Services::RufletServices::CLASS_MAP
           .merge(Controls::RufletControls::CLASS_MAP)
+          .merge(PlatformControlContracts::CLASS_MAP)
           .freeze
       EXTENSION_CLASS_MAP = {}
       CONSTRUCTOR_KEYWORDS_CACHE = {}

data/lib/ruflet_ui/ruflet/ui/control_methods.rb

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
 require_relative "material_control_methods"
+require_relative "platform_control_methods"
 require_relative "cupertino_control_methods"
 
 module Ruflet
   module UI
     module ControlMethods
       include MaterialControlMethods
+      include PlatformControlMethods
+      # Compatibility aliases only. They emit the same canonical wire types as
+      # the methods above and never select the visual renderer.
       include CupertinoControlMethods
 
       def control(type, **props, &block) = build_widget(type, **props, &block)

data/lib/ruflet_ui/ruflet/ui/control_registry.rb

@@ -7,7 +7,26 @@ module Ruflet
       require_relative "cupertino_control_registry"
       require_relative "controls/ruflet_controls"
       require_relative "services/ruflet_services"
-      TYPE_MAP = MaterialControlRegistry::TYPE_MAP.merge(CupertinoControlRegistry::TYPE_MAP).freeze
+      require_relative "platform_control_contracts"
+      # Controls whose Ruby name and wire name differ on purpose. The client
+      # Native Ruflet clients use RufletApp as the canonical wire type while
+      # the Ruby API remains ruflet_app.
+      #
+      # RufletAppControl::WIRE already says this, but that is only read when the
+      # control resolves to its own class. Serialization otherwise derives the
+      # wire name from the type and must still send the canonical RufletApp.
+      # Map it here so both paths agree. to_patch also looks the type up with
+      # underscores removed, so register that spelling too.
+      SHARED_TYPE_MAP = {
+        "ruflet_app" => "RufletApp",
+        "rufletapp" => "RufletApp"
+      }.freeze
+
+      TYPE_MAP = MaterialControlRegistry::TYPE_MAP
+                 .merge(CupertinoControlRegistry::TYPE_MAP)
+                 .merge(SHARED_TYPE_MAP)
+                 .merge(PlatformControlContracts::TYPE_MAP)
+                 .freeze
       SCHEMA_EVENT_PROPS =
         Controls::RufletControls::CLASS_MAP
           .merge(Services::RufletServices::CLASS_MAP)

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinoactionsheet_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoActionSheetControl < Ruflet::Control
           TYPE = "cupertinoactionsheet".freeze
-          WIRE = "CupertinoActionSheet".freeze
+          WIRE = "ActionSheet".freeze
 
           KEYWORDS = [:actions, :align, :animate_align, :animate_margin, :animate_offset, :animate_opacity, :animate_position, :animate_rotation, :animate_scale, :animate_size, :aspect_ratio, :badge, :bottom, :cancel, :col, :data, :disabled, :expand, :expand_loose, :height, :key, :left, :margin, :message, :offset, :opacity, :right, :rotate, :rtl, :scale, :size_change_interval, :title, :tooltip, :top, :visible, :width, :on_animation_end, :on_size_change].freeze
 

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinoactionsheetaction_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoActionSheetActionControl < Ruflet::Control
           TYPE = "cupertinoactionsheetaction".freeze
-          WIRE = "CupertinoActionSheetAction".freeze
+          WIRE = "ActionSheetAction".freeze
 
           KEYWORDS = [:align, :animate_align, :animate_margin, :animate_offset, :animate_opacity, :animate_position, :animate_rotation, :animate_scale, :animate_size, :aspect_ratio, :badge, :bottom, :col, :content, :data, :default, :destructive, :disabled, :expand, :expand_loose, :height, :key, :left, :margin, :mouse_cursor, :offset, :opacity, :right, :rotate, :rtl, :scale, :size_change_interval, :tooltip, :top, :visible, :width, :on_animation_end, :on_click, :on_size_change].freeze
 

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinoactivityindicator_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoActivityIndicatorControl < Ruflet::Control
           TYPE = "cupertinoactivityindicator".freeze
-          WIRE = "CupertinoActivityIndicator".freeze
+          WIRE = "ProgressRing".freeze
 
           KEYWORDS = [:align, :animate_align, :animate_margin, :animate_offset, :animate_opacity, :animate_position, :animate_rotation, :animate_scale, :animate_size, :animating, :aspect_ratio, :badge, :bottom, :col, :color, :data, :disabled, :expand, :expand_loose, :height, :key, :left, :margin, :offset, :opacity, :progress, :radius, :right, :rotate, :rtl, :scale, :size_change_interval, :tooltip, :top, :visible, :width, :on_animation_end, :on_size_change].freeze
 

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinoalertdialog_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoAlertDialogControl < Ruflet::Control
           TYPE = "cupertinoalertdialog".freeze
-          WIRE = "CupertinoAlertDialog".freeze
+          WIRE = "AlertDialog".freeze
 
           def initialize(id: nil, actions: nil, adaptive: nil, badge: nil, barrier_color: nil, col: nil, content: nil, data: nil, disabled: nil, expand: nil, expand_loose: nil, inset_animation: nil, key: nil, modal: nil, opacity: nil, open: nil, rtl: nil, title: nil, tooltip: nil, visible: nil, on_dismiss: nil)
             actions = [] if actions.nil?

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinoappbar_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoAppBarControl < Ruflet::Control
           TYPE = "cupertinoappbar".freeze
-          WIRE = "CupertinoAppBar".freeze
+          WIRE = "AppBar".freeze
 
           def initialize(id: nil, automatic_background_visibility: nil, automatically_imply_leading: nil, automatically_imply_title: nil, badge: nil, bgcolor: nil, border: nil, brightness: nil, col: nil, data: nil, disabled: nil, enable_background_filter_blur: nil, expand: nil, expand_loose: nil, key: nil, large: nil, leading: nil, opacity: nil, padding: nil, previous_page_title: nil, rtl: nil, title: nil, tooltip: nil, trailing: nil, transition_between_routes: nil, visible: nil)
             large = false if large.nil?

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinobottomsheet_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoBottomSheetControl < Ruflet::Control
           TYPE = "cupertinobottomsheet".freeze
-          WIRE = "CupertinoBottomSheet".freeze
+          WIRE = "BottomSheet".freeze
 
           def initialize(id: nil, adaptive: nil, badge: nil, bgcolor: nil, col: nil, content: nil, data: nil, disabled: nil, expand: nil, expand_loose: nil, height: nil, key: nil, modal: nil, opacity: nil, open: nil, padding: nil, rtl: nil, tooltip: nil, visible: nil, on_dismiss: nil)
             raise ArgumentError, "cupertino_bottom_sheet content is required" if content.nil?

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinobutton_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoButtonControl < Ruflet::Control
           TYPE = "cupertinobutton".freeze
-          WIRE = "CupertinoButton".freeze
+          WIRE = "Button".freeze
 
           KEYWORDS = [:align, :alignment, :animate_align, :animate_margin, :animate_offset, :animate_opacity, :animate_position, :animate_rotation, :animate_scale, :animate_size, :aspect_ratio, :autofocus, :badge, :bgcolor, :border_radius, :bottom, :col, :color, :content, :data, :disabled, :disabled_bgcolor, :expand, :expand_loose, :focus_color, :height, :icon, :icon_color, :key, :left, :margin, :min_size, :mouse_cursor, :offset, :opacity, :opacity_on_click, :padding, :right, :rotate, :rtl, :scale, :size, :size_change_interval, :tooltip, :top, :url, :visible, :width, :on_animation_end, :on_blur, :on_click, :on_focus, :on_long_press, :on_size_change].freeze
 

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinocheckbox_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoCheckboxControl < Ruflet::Control
           TYPE = "cupertinocheckbox".freeze
-          WIRE = "CupertinoCheckbox".freeze
+          WIRE = "Checkbox".freeze
 
           KEYWORDS = [:active_color, :align, :animate_align, :animate_margin, :animate_offset, :animate_opacity, :animate_position, :animate_rotation, :animate_scale, :animate_size, :aspect_ratio, :autofocus, :badge, :border_side, :bottom, :check_color, :col, :data, :disabled, :expand, :expand_loose, :fill_color, :focus_color, :height, :key, :label, :label_position, :left, :margin, :mouse_cursor, :offset, :opacity, :right, :rotate, :rtl, :scale, :semantics_label, :shape, :size_change_interval, :spacing, :tooltip, :top, :tristate, :value, :visible, :width, :on_animation_end, :on_blur, :on_change, :on_focus, :on_size_change].freeze
 

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinocontextmenu_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoContextMenuControl < Ruflet::Control
           TYPE = "cupertinocontextmenu".freeze
-          WIRE = "CupertinoContextMenu".freeze
+          WIRE = "ContextMenu".freeze
 
           def initialize(id: nil, actions: nil, adaptive: nil, badge: nil, col: nil, content: nil, data: nil, disabled: nil, enable_haptic_feedback: nil, expand: nil, expand_loose: nil, key: nil, opacity: nil, rtl: nil, tooltip: nil, visible: nil)
             enable_haptic_feedback = true if enable_haptic_feedback.nil?

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinocontextmenuaction_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoContextMenuActionControl < Ruflet::Control
           TYPE = "cupertinocontextmenuaction".freeze
-          WIRE = "CupertinoContextMenuAction".freeze
+          WIRE = "ContextMenuAction".freeze
 
           def initialize(id: nil, adaptive: nil, badge: nil, col: nil, content: nil, data: nil, default: nil, destructive: nil, disabled: nil, expand: nil, expand_loose: nil, key: nil, opacity: nil, rtl: nil, tooltip: nil, trailing_icon: nil, visible: nil, on_click: nil)
             raise ArgumentError, "cupertino_context_menu_action requires content" if content.nil?

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinodatepicker_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoDatePickerControl < Ruflet::Control
           TYPE = "cupertinodatepicker".freeze
-          WIRE = "CupertinoDatePicker".freeze
+          WIRE = "DatePicker".freeze
 
           KEYWORDS = [:align, :animate_align, :animate_margin, :animate_offset, :animate_opacity, :animate_position, :animate_rotation, :animate_scale, :animate_size, :aspect_ratio, :badge, :bgcolor, :bottom, :col, :data, :date_order, :date_picker_mode, :disabled, :expand, :expand_loose, :first_date, :height, :item_extent, :key, :last_date, :left, :locale, :margin, :maximum_year, :minimum_year, :minute_interval, :offset, :opacity, :right, :rotate, :rtl, :scale, :show_day_of_week, :size_change_interval, :tooltip, :top, :use_24h_format, :value, :visible, :width, :on_animation_end, :on_change, :on_size_change].freeze
 

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinodialogaction_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoDialogActionControl < Ruflet::Control
           TYPE = "cupertinodialogaction".freeze
-          WIRE = "CupertinoDialogAction".freeze
+          WIRE = "Button".freeze
 
           def initialize(id: nil, badge: nil, col: nil, content: nil, data: nil, default: nil, destructive: nil, disabled: nil, expand: nil, expand_loose: nil, key: nil, opacity: nil, rtl: nil, text_style: nil, tooltip: nil, visible: nil, on_click: nil)
             raise ArgumentError, "cupertino_dialog_action requires content" if content.nil?

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinofilledbutton_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoFilledButtonControl < Ruflet::Control
           TYPE = "cupertinofilledbutton".freeze
-          WIRE = "CupertinoFilledButton".freeze
+          WIRE = "FilledButton".freeze
 
           KEYWORDS = [:align, :alignment, :animate_align, :animate_margin, :animate_offset, :animate_opacity, :animate_position, :animate_rotation, :animate_scale, :animate_size, :aspect_ratio, :autofocus, :badge, :bgcolor, :border_radius, :bottom, :col, :color, :content, :data, :disabled, :disabled_bgcolor, :expand, :expand_loose, :focus_color, :height, :icon, :icon_color, :key, :left, :margin, :min_size, :mouse_cursor, :offset, :opacity, :opacity_on_click, :padding, :right, :rotate, :rtl, :scale, :size, :size_change_interval, :tooltip, :top, :url, :visible, :width, :on_animation_end, :on_blur, :on_click, :on_focus, :on_long_press, :on_size_change].freeze
 

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinolisttile_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoListTileControl < Ruflet::Control
           TYPE = "cupertinolisttile".freeze
-          WIRE = "CupertinoListTile".freeze
+          WIRE = "ListTile".freeze
 
           KEYWORDS = [:additional_info, :align, :animate_align, :animate_margin, :animate_offset, :animate_opacity, :animate_position, :animate_rotation, :animate_scale, :animate_size, :aspect_ratio, :badge, :bgcolor, :bgcolor_activated, :bottom, :col, :data, :disabled, :expand, :expand_loose, :height, :key, :leading, :leading_size, :leading_to_title, :left, :margin, :notched, :offset, :opacity, :padding, :right, :rotate, :rtl, :scale, :size_change_interval, :subtitle, :title, :toggle_inputs, :tooltip, :top, :trailing, :url, :visible, :width, :on_animation_end, :on_click, :on_size_change].freeze
 

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinonavigationbar_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoNavigationBarControl < Ruflet::Control
           TYPE = "cupertinonavigationbar".freeze
-          WIRE = "CupertinoNavigationBar".freeze
+          WIRE = "NavigationBar".freeze
 
           KEYWORDS = [:active_color, :align, :animate_align, :animate_margin, :animate_offset, :animate_opacity, :animate_position, :animate_rotation, :animate_scale, :animate_size, :aspect_ratio, :badge, :bgcolor, :border, :bottom, :col, :data, :destinations, :disabled, :expand, :expand_loose, :height, :icon_size, :inactive_color, :key, :left, :margin, :offset, :opacity, :right, :rotate, :rtl, :scale, :selected_index, :size_change_interval, :tooltip, :top, :visible, :width, :on_animation_end, :on_change, :on_size_change].freeze
 

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinopicker_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoPickerControl < Ruflet::Control
           TYPE = "cupertinopicker".freeze
-          WIRE = "CupertinoPicker".freeze
+          WIRE = "Picker".freeze
 
           KEYWORDS = [:align, :animate_align, :animate_margin, :animate_offset, :animate_opacity, :animate_position, :animate_rotation, :animate_scale, :animate_size, :aspect_ratio, :badge, :bgcolor, :bottom, :col, :controls, :data, :default_selection_overlay_bgcolor, :diameter_ratio, :disabled, :expand, :expand_loose, :height, :item_extent, :key, :left, :looping, :magnification, :margin, :off_axis_fraction, :offset, :opacity, :right, :rotate, :rtl, :scale, :selected_index, :selection_overlay, :size_change_interval, :squeeze, :tooltip, :top, :use_magnifier, :visible, :width, :on_animation_end, :on_change, :on_size_change].freeze
 

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinoradio_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoRadioControl < Ruflet::Control
           TYPE = "cupertinoradio".freeze
-          WIRE = "CupertinoRadio".freeze
+          WIRE = "Radio".freeze
 
           KEYWORDS = [:active_color, :align, :animate_align, :animate_margin, :animate_offset, :animate_opacity, :animate_position, :animate_rotation, :animate_scale, :animate_size, :aspect_ratio, :autofocus, :badge, :bottom, :col, :data, :disabled, :expand, :expand_loose, :fill_color, :focus_color, :height, :inactive_color, :key, :label, :label_position, :left, :margin, :mouse_cursor, :offset, :opacity, :right, :rotate, :rtl, :scale, :size_change_interval, :toggleable, :tooltip, :top, :use_checkmark_style, :value, :visible, :width, :on_animation_end, :on_blur, :on_focus, :on_size_change].freeze
 

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinosegmentedbutton_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoSegmentedButtonControl < Ruflet::Control
           TYPE = "cupertinosegmentedbutton".freeze
-          WIRE = "CupertinoSegmentedButton".freeze
+          WIRE = "SegmentedButton".freeze
 
           KEYWORDS = [:align, :animate_align, :animate_margin, :animate_offset, :animate_opacity, :animate_position, :animate_rotation, :animate_scale, :animate_size, :aspect_ratio, :badge, :border_color, :bottom, :click_color, :col, :controls, :data, :disabled, :disabled_color, :disabled_text_color, :expand, :expand_loose, :height, :key, :left, :margin, :offset, :opacity, :padding, :right, :rotate, :rtl, :scale, :selected_color, :selected_index, :size_change_interval, :tooltip, :top, :unselected_color, :visible, :width, :on_animation_end, :on_change, :on_size_change].freeze
 

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinoslider_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoSliderControl < Ruflet::Control
           TYPE = "cupertinoslider".freeze
-          WIRE = "CupertinoSlider".freeze
+          WIRE = "Slider".freeze
 
           KEYWORDS = [:active_color, :align, :animate_align, :animate_margin, :animate_offset, :animate_opacity, :animate_position, :animate_rotation, :animate_scale, :animate_size, :aspect_ratio, :badge, :bottom, :col, :data, :disabled, :divisions, :expand, :expand_loose, :height, :key, :left, :margin, :max, :min, :offset, :opacity, :right, :rotate, :rtl, :scale, :size_change_interval, :thumb_color, :tooltip, :top, :value, :visible, :width, :on_animation_end, :on_blur, :on_change, :on_change_end, :on_change_start, :on_focus, :on_size_change].freeze
 

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinoslidingsegmentedbutton_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoSlidingSegmentedButtonControl < Ruflet::Control
           TYPE = "cupertinoslidingsegmentedbutton".freeze
-          WIRE = "CupertinoSlidingSegmentedButton".freeze
+          WIRE = "SegmentedButton".freeze
 
           KEYWORDS = [:align, :animate_align, :animate_margin, :animate_offset, :animate_opacity, :animate_position, :animate_rotation, :animate_scale, :animate_size, :aspect_ratio, :badge, :bgcolor, :bottom, :col, :controls, :data, :disabled, :expand, :expand_loose, :height, :key, :left, :margin, :offset, :opacity, :padding, :proportional_width, :right, :rotate, :rtl, :scale, :selected_index, :size_change_interval, :thumb_color, :tooltip, :top, :visible, :width, :on_animation_end, :on_change, :on_size_change].freeze
 

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinoswitch_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoSwitchControl < Ruflet::Control
           TYPE = "cupertinoswitch".freeze
-          WIRE = "CupertinoSwitch".freeze
+          WIRE = "Switch".freeze
 
           KEYWORDS = [:active_thumb_image, :active_thumb_image_src, :active_track_color, :align, :animate_align, :animate_margin, :animate_offset, :animate_opacity, :animate_position, :animate_rotation, :animate_scale, :animate_size, :aspect_ratio, :autofocus, :badge, :bottom, :col, :data, :disabled, :expand, :expand_loose, :focus_color, :height, :inactive_thumb_color, :inactive_thumb_image, :inactive_thumb_image_src, :inactive_track_color, :key, :label, :label_position, :left, :margin, :off_label_color, :offset, :opacity, :right, :rotate, :rtl, :scale, :size_change_interval, :thumb_color, :thumb_icon, :tooltip, :top, :track_outline_color, :track_outline_width, :value, :visible, :width, :on_animation_end, :on_blur, :on_change, :on_focus, :on_image_error, :on_label_color, :on_size_change].freeze
 

data/lib/ruflet_ui/ruflet/ui/controls/cupertinos/cupertinotextfield_control.rb

@@ -6,7 +6,7 @@ module Ruflet
       module RufletComponents
         class CupertinoTextFieldControl < Ruflet::Control
           TYPE = "cupertinotextfield".freeze
-          WIRE = "CupertinoTextField".freeze
+          WIRE = "TextField".freeze
 
           KEYWORDS = [:adaptive, :align, :align_label_with_hint, :always_call_on_tap, :animate_align, :animate_cursor_opacity, :animate_margin, :animate_offset, :animate_opacity, :animate_position, :animate_rotation, :animate_scale, :animate_size, :aspect_ratio, :autocorrect, :autofill_hints, :autofocus, :badge, :bgcolor, :blend_mode, :border, :border_color, :border_radius, :border_width, :bottom, :can_request_focus, :can_reveal_password, :capitalization, :clear_button_semantics_label, :clear_button_visibility_mode, :clip_behavior, :col, :collapsed, :color, :content_padding, :counter, :counter_style, :cursor_color, :cursor_error_color, :cursor_height, :cursor_radius, :cursor_width, :data, :dense, :disabled, :enable_ime_personalized_learning, :enable_interactive_selection, :enable_stylus_handwriting, :enable_suggestions, :error, :error_max_lines, :error_style, :expand, :expand_loose, :fill_color, :filled, :fit_parent_size, :focus_color, :focused_bgcolor, :focused_border_color, :focused_border_width, :focused_color, :gradient, :height, :helper, :helper_max_lines, :helper_style, :hint_fade_duration, :hint_max_lines, :hint_style, :hint_text, :hover_color, :icon, :ignore_pointers, :ignore_up_down_keys, :image, :input_filter, :key, :keyboard_brightness, :keyboard_type, :label, :label_style, :left, :margin, :max_length, :max_lines, :min_lines, :mouse_cursor, :multiline, :obscuring_character, :offset, :opacity, :padding, :password, :placeholder_style, :placeholder_text, :prefix, :prefix_icon, :prefix_icon_size_constraints, :prefix_style, :prefix_visibility_mode, :read_only, :right, :rotate, :rtl, :scale, :scroll_padding, :selection, :selection_color, :shadows, :shift_enter, :show_cursor, :size_change_interval, :size_constraints, :smart_dashes_type, :smart_quotes_type, :strut_style, :suffix, :suffix_icon, :suffix_icon_size_constraints, :suffix_style, :suffix_visibility_mode, :text_align, :text_size, :text_style, :text_vertical_align, :tooltip, :top, :value, :visible, :width, :on_animation_end, :on_blur, :on_change, :on_click, :on_focus, :on_selection_change, :on_size_change, :on_submit, :on_tap_outside].freeze