ruflet_core 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96131a85e131d05e9d2bbe07eb2bb3ceba97aeb2112301d4d6137d7067e81c3c
-  data.tar.gz: 21245edeb2dc44b0cfe457c34678a552929ef813b2309494453582b717558209
+  metadata.gz: f3e8b0865b88790b85de1ad455a9b262603722e1919b25af614994765794d704
+  data.tar.gz: 8f16bbf7b16594ef9a4ff31d91e7fac5b67d36edd26021f297be09a110da95cf
 SHA512:
-  metadata.gz: 1889c987529cb0915da64b09e534d8d132c34c1ec1553d099f3a81340744d57a5a48a8325ae77f6a4b19f7537440dae1a6c77a5dc7d632548b7dfe297de857f7
-  data.tar.gz: ce99b6ffcae8ccc7c6837df5f53fe936bd1df521c73642a60957a3552a53500b5626a2d0611d571cc069efca0c597194ff4ec627916b73d07081e6046cf96611
+  metadata.gz: e97396572fb70e02900174cc177dc435159083d844f4f44a6dd9c854543af13eb866cbfd17265ac6c4239f260bc78e171eb02cfd16c564bf1e2d3203241d8661
+  data.tar.gz: e1db85c6c73756534c68018ee32803beda36d50237511e259ba693c269a0c671e0432e4417083b99bad0feb50b984244c16f33eab36d755930c833496fff27fc

data/lib/ruflet/version.rb

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

data/lib/ruflet_ui/ruflet/dsl.rb

@@ -51,6 +51,16 @@ 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 view(children = nil, **props, &block) = _pending_app.view(children, **props, &block)
+    def base_page(**props, &block) = _pending_app.base_page(**props, &block)
+    def basepage(**props, &block) = _pending_app.basepage(**props, &block)
+    def dialogs(controls = nil, **props) = _pending_app.dialogs(controls, **props)
+    def pagelet(content = nil, **props, &block) = _pending_app.pagelet(content, **props, &block)
+    def ruflet_app(**props) = _pending_app.ruflet_app(**props)
+    def rufletapp(**props) = _pending_app.rufletapp(**props)
+    def service_registry(services = nil, **props) = _pending_app.service_registry(services, **props)
+    def serviceregistry(services = nil, **props) = _pending_app.serviceregistry(services, **props)
+    def window(**props) = _pending_app.window(**props)
     def column(children = nil, **props, &block) = _pending_app.column(children, **props, &block)
     def center(**props, &block) = _pending_app.center(**props, &block)
     def row(children = nil, **props, &block) = _pending_app.row(children, **props, &block)
@@ -62,7 +72,31 @@ module Ruflet
     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 accelerometer(**props) = _pending_app.accelerometer(**props)
     def audio(**props) = _pending_app.audio(**props)
+    def audio_recorder(**props) = _pending_app.audio_recorder(**props)
+    def barometer(**props) = _pending_app.barometer(**props)
+    def battery(**props) = _pending_app.battery(**props)
+    def browser_context_menu(**props) = _pending_app.browser_context_menu(**props)
+    def camera(**props) = _pending_app.camera(**props)
+    def connectivity(**props) = _pending_app.connectivity(**props)
+    def file_picker(**props) = _pending_app.file_picker(**props)
+    def flashlight(**props) = _pending_app.flashlight(**props)
+    def geolocator(**props) = _pending_app.geolocator(**props)
+    def gyroscope(**props) = _pending_app.gyroscope(**props)
+    def haptic_feedback(**props) = _pending_app.haptic_feedback(**props)
+    def magnetometer(**props) = _pending_app.magnetometer(**props)
+    def permission_handler(**props) = _pending_app.permission_handler(**props)
+    def screen_brightness(**props) = _pending_app.screen_brightness(**props)
+    def secure_storage(**props) = _pending_app.secure_storage(**props)
+    def semantics_service(**props) = _pending_app.semantics_service(**props)
+    def shake_detector(**props) = _pending_app.shake_detector(**props)
+    def share(**props) = _pending_app.share(**props)
+    def shared_preferences(**props) = _pending_app.shared_preferences(**props)
+    def storage_paths(**props) = _pending_app.storage_paths(**props)
+    def url_launcher(**props) = _pending_app.url_launcher(**props)
+    def user_accelerometer(**props) = _pending_app.user_accelerometer(**props)
+    def wakelock(**props) = _pending_app.wakelock(**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)
@@ -70,6 +104,8 @@ module Ruflet
     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 context_menu_action(content = nil, **props) = _pending_app.context_menu_action(content, **props)
+    def contextmenuaction(content = nil, **props) = _pending_app.contextmenuaction(content, **props)
     def autofill_group(content = nil, **props) = _pending_app.autofill_group(content, **props)
     def autofillgroup(content = nil, **props) = _pending_app.autofillgroup(content, **props)
     def hero(content = nil, **props) = _pending_app.hero(content, **props)
@@ -133,6 +169,14 @@ module Ruflet
     def polygonmarker(**props) = _pending_app.polygonmarker(**props)
     def simple_attribution(**props) = _pending_app.simple_attribution(**props)
     def simpleattribution(**props) = _pending_app.simpleattribution(**props)
+    def map_layer(**props) = _pending_app.map_layer(**props)
+    def maplayer(**props) = _pending_app.maplayer(**props)
+    def rich_attribution(attributions = nil, **props) = _pending_app.rich_attribution(attributions, **props)
+    def richattribution(attributions = nil, **props) = _pending_app.richattribution(attributions, **props)
+    def image_source_attribution(image = nil, **props) = _pending_app.image_source_attribution(image, **props)
+    def imagesourceattribution(image = nil, **props) = _pending_app.imagesourceattribution(image, **props)
+    def text_source_attribution(text = nil, **props) = _pending_app.text_source_attribution(text, **props)
+    def textsourceattribution(text = nil, **props) = _pending_app.textsourceattribution(text, **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)
@@ -160,6 +204,13 @@ module Ruflet
     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 option(key = nil, **props) = _pending_app.option(key, **props)
+    def data_table2(columns = nil, **props) = _pending_app.data_table2(columns, **props)
+    def datatable2(columns = nil, **props) = _pending_app.datatable2(columns, **props)
+    def data_column2(label = nil, **props) = _pending_app.data_column2(label, **props)
+    def datacolumn2(label = nil, **props) = _pending_app.datacolumn2(label, **props)
+    def data_row2(cells = nil, **props) = _pending_app.data_row2(cells, **props)
+    def datarow2(cells = nil, **props) = _pending_app.datarow2(cells, **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)
@@ -178,6 +229,9 @@ module Ruflet
     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 picker(children = nil, **props) = _pending_app.picker(children, **props)
+    def timer_picker(**props) = _pending_app.timer_picker(**props)
+    def timerpicker(**props) = _pending_app.timerpicker(**props)
     def spinkit(**props) = _pending_app.spinkit(**props)
     def range_slider(**props) = _pending_app.range_slider(**props)
     def rangeslider(**props) = _pending_app.rangeslider(**props)
@@ -257,6 +311,10 @@ module Ruflet
     def snackbaraction(label = nil, **props) = _pending_app.snackbaraction(label, **props)
     def bottom_sheet(content = nil, **props) = _pending_app.bottom_sheet(content, **props)
     def bottomsheet(content = nil, **props) = _pending_app.bottomsheet(content, **props)
+    def action_sheet(**props) = _pending_app.action_sheet(**props)
+    def actionsheet(**props) = _pending_app.actionsheet(**props)
+    def action_sheet_action(content = nil, **props) = _pending_app.action_sheet_action(content, **props)
+    def actionsheetaction(content = nil, **props) = _pending_app.actionsheetaction(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)
@@ -319,6 +377,24 @@ module Ruflet
     def web_view(**props) = _pending_app.web_view(**props)
     def webview(**props) = _pending_app.webview(**props)
     def video(**props) = _pending_app.video(**props)
+    def block_picker(**props) = _pending_app.block_picker(**props)
+    def blockpicker(**props) = _pending_app.blockpicker(**props)
+    def color_picker(**props) = _pending_app.color_picker(**props)
+    def colorpicker(**props) = _pending_app.colorpicker(**props)
+    def hue_ring_picker(**props) = _pending_app.hue_ring_picker(**props)
+    def hueringpicker(**props) = _pending_app.hueringpicker(**props)
+    def material_picker(**props) = _pending_app.material_picker(**props)
+    def materialpicker(**props) = _pending_app.materialpicker(**props)
+    def multiple_choice_block_picker(**props) = _pending_app.multiple_choice_block_picker(**props)
+    def multiplechoiceblockpicker(**props) = _pending_app.multiplechoiceblockpicker(**props)
+    def slide_picker(**props) = _pending_app.slide_picker(**props)
+    def slidepicker(**props) = _pending_app.slidepicker(**props)
+    def banner_ad(**props) = _pending_app.banner_ad(**props)
+    def bannerad(**props) = _pending_app.bannerad(**props)
+    def interstitial_ad(**props) = _pending_app.interstitial_ad(**props)
+    def interstitialad(**props) = _pending_app.interstitialad(**props)
+    def native_ad(**props) = _pending_app.native_ad(**props)
+    def nativead(**props) = _pending_app.nativead(**props)
     def code_editor(value = nil, **props) = _pending_app.code_editor(value, **props)
     def codeeditor(value = nil, **props) = _pending_app.codeeditor(value, **props)
     def lottie(src = nil, **props) = _pending_app.lottie(src, **props)

data/lib/ruflet_ui/ruflet/event.rb

@@ -30,9 +30,10 @@ module Ruflet
 
     def parse_data(raw)
       return raw unless raw.is_a?(String)
+      return raw unless Object.const_defined?(:JSON)
 
-      JSON.parse(raw)
-    rescue JSON::ParserError
+      Object.const_get(:JSON).parse(raw)
+    rescue StandardError
       raw
     end
 

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

@@ -48,7 +48,8 @@ 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["route"]
+            key = %w[value v data state route].find { |candidate| raw.key?(candidate) }
+            key.nil? ? nil : raw[key]
           else
             raw
           end

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