ruflet_core 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 888ec7addc07079a2ef3b649047b8747d031b446489d3015fb96cb5c2101b339
-  data.tar.gz: 342aac065292f59865cf01ace0347531803b41692eac2d3453fe5751c773fe0a
+  metadata.gz: 82d5d751f2b92b2b740414e315e1b1f9e88389eb0423ec0ce7a040710e191d59
+  data.tar.gz: 728109060a0cff6ca564e2bfa5d7620e5f8182dc05cf82b571ae3280e7e0a015
 SHA512:
-  metadata.gz: 2ef5114b3cc6389dafae6ab528990b7be92c0bc2367c62fc2eb0920feaec0dccc17400df7961df5b162bfbc539c2489818f77ac1dd91a040ebb87e1964016906
-  data.tar.gz: 9ad45dc326587bb2a601733b3c1efef6199c9d38424e8a82979d7b9f357fa44ffb579f19de30a3e2c8b2dd78681baf867b7555e9c21883f1f60dd44b7f4f50e0
+  metadata.gz: bf40cdafd48b625d189f9625945350873b4936c0668916ce8556e9d07f47368584892b29e57e4fe2e4583230d7ce5c87297848b90c5d01ab1d7ddac0b60df4d2
+  data.tar.gz: 2d229699ad359fcbc5dc5640dd176227bd0dad3f01d641b9f44ea569b26ccea61926b16c465284bda7e2fb786b514215922b8fdda5aa0a6b5f6baca36c0303fe

data/README.md

@@ -11,9 +11,21 @@ require "ruflet"
 
 Ruflet.run do |page|
   page.title = "Hello"
-  page.add(text("Hello Ruflet"))
+  page.add(
+    container(
+      bgcolor: :surface_container_high,
+      padding: 24,
+      content: text("Hello Ruflet", color: "DeepOrange500")
+    )
+  )
 end
 ```
 
+Color properties accept named colors and hex values. Use Ruby-style symbols
+like `:deep_orange_500`, compact strings like `"DeepOrange500"`, spaced names
+like `"Deep Orange 500"`, semantic theme names like `:primary_container`, or
+hex strings like `"#ff6d00"`. Ruflet normalizes named colors before sending
+them to the client.
+
 Use `ruflet_server` to run a standalone server-driven application. Use
 `ruflet_rails` when the UI is hosted by Rails.

data/lib/ruflet/version.rb

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

data/lib/ruflet_ui/ruflet/colors.rb

@@ -158,16 +158,48 @@ module Ruflet
       canonicalize(color.to_s)
     end
 
+    def self.normalize_property(key, value)
+      normalize_value(value, color_key?(key))
+    end
+
+    def self.color_key?(key)
+      name = key.to_s
+      name == "color" ||
+        name == "colors" ||
+        name.end_with?("bgcolor") ||
+        name.end_with?("_color") ||
+        name.end_with?("_colors") ||
+        name == "color_scheme_seed"
+    end
+
+    def self.normalize_value(value, color_context = false)
+      case value
+      when String
+        color_context ? canonicalize(value) : value
+      when Symbol
+        color_context ? canonicalize(value.to_s) : value
+      when Array
+        value.map { |nested| normalize_value(nested, color_context) }
+      when Hash
+        value.each_with_object({}) do |(nested_key, nested_value), result|
+          result[nested_key] = normalize_value(nested_value, color_context || color_key?(nested_key))
+        end
+      else
+        value
+      end
+    end
+
     # Canonicalizes a named color into flet's wire format. Flet color names are
     # lowercase with no separators ("bluegrey", "deeporange", "red500"), so we
-    # strip underscores/whitespace and downcase. Hex values (#... / 0x...) and
-    # the optional ",opacity" suffix are preserved untouched.
+    # strip underscores, hyphens, and whitespace before downcasing. Hex values
+    # (#... / 0x...) are downcased without separator stripping; the optional
+    # ",opacity" suffix is preserved untouched.
     def self.canonicalize(value)
       return value unless value.is_a?(String)
 
       color, separator, opacity = value.partition(",")
       color = color.strip.downcase
-      color = color.delete("_ \t\n") unless color.start_with?("#") || color.start_with?("0x")
+      color = color.gsub(/[_\-\s]+/, "") unless color.start_with?("#") || color.start_with?("0x")
 
       "#{color}#{separator}#{opacity}"
     end

data/lib/ruflet_ui/ruflet/control.rb

@@ -198,14 +198,11 @@ module Ruflet
     end
 
     def normalize_color_prop(key, value)
-      return value unless value.is_a?(String)
-      return Ruflet::Colors.canonicalize(value) if color_prop_key?(key)
-
-      value
+      Ruflet::Colors.normalize_property(key, value)
     end
 
     def color_prop_key?(key)
-      key == "color" || key.end_with?("bgcolor") || key.end_with?("_color")
+      Ruflet::Colors.color_key?(key)
     end
 
     def normalize_icon_prop(key, value)

data/lib/ruflet_ui/ruflet/page.rb

@@ -183,6 +183,7 @@ module Ruflet
         id: "_dialogs",
         controls: []
       )
+      @mounted_services = []
       @invoke_waiters = {}
       @invoke_callbacks = {}
       @invoke_waiters_mutex = Mutex.new
@@ -540,6 +541,12 @@ module Ruflet
     def bottom_sheet=(value)
       @bottom_sheet = value
       refresh_dialogs_container!
+      # Mirror dialog= / snack_bar=: once the dialogs container is mounted, push
+      # the change as an in-place patch. Without this, opening a bottom sheet
+      # after the container is already mounted (e.g. a prior dialog/snackbar)
+      # never reaches the client, since send_view_patch skips _dialogs once
+      # mounted. This is what made NativeApp's modal: sheets fail to open.
+      push_dialogs_update! if @dialogs_container_mounted
     end
 
     def bottomsheet=(value)
@@ -1567,6 +1574,7 @@ module Ruflet
         raise ArgumentError, "page #{key} must use an icon name string, not #{value.inspect}"
       end
 
+      value = Ruflet::Colors.normalize_property(key, value)
       return value.value if value.is_a?(Ruflet::IconData)
       value.is_a?(Symbol) ? value.to_s : value
     end
@@ -1592,8 +1600,14 @@ module Ruflet
       query_string = route_value.to_s.split("?", 2)[1].to_s
       return {} if query_string.empty?
 
-      CGI.parse(query_string).each_with_object({}) do |(key, values), result|
-        result[key] = values.size == 1 ? values.first : values
+      query_string.split("&").each_with_object({}) do |pair, result|
+        next if pair.empty?
+
+        key, value = pair.split("=", 2)
+        key = CGI.unescape(key.to_s.tr("+", " "))
+        value = CGI.unescape(value.to_s.tr("+", " "))
+        previous = result[key]
+        result[key] = previous.nil? ? value : Array(previous) << value
       end
     end
 
@@ -1701,14 +1715,61 @@ module Ruflet
     def push_services_update!
       refresh_control_indexes!
 
-      if @services_container.wire_id
+      unless @services_container.wire_id
+        # First mount: the whole list ships inside the page/view patch.
+        send_view_patch
+        @mounted_services = Array(@services_container.props["_services"]).dup
+        return
+      end
+
+      current = Array(@services_container.props["_services"])
+      ops = services_patch_ops(@mounted_services, current)
+      unless ops.empty?
+        # Incrementally add/remove individual services. Re-sending the whole
+        # `_services` list as full objects (a single replace op) makes the
+        # client run Control.fromMap for EVERY service, replacing each Control
+        # instance while ServiceRegistry only binds ids it hasn't seen — so an
+        # already-mounted service (share, clipboard, haptic) keeps its old
+        # binding while controlsIndex points at the fresh, listener-less
+        # instance, and its next invoke hangs. That was the "after Copy, Share
+        # stops working" bug. Add/remove ops leave untouched services intact.
         send_message(Protocol::ACTIONS[:patch_control], {
           "id" => @services_container.wire_id,
-          "patch" => [[0], [0, 0, "_services", serialize_patch_value(@services_container.props["_services"])]]
+          "patch" => [[0, { "_services" => [1] }], *ops]
         })
-      else
-        send_view_patch
       end
+      @mounted_services = current.dup
+    end
+
+    # Diff the previously-mounted services list against the current one and emit
+    # add (1) / remove (2) ops against the `_services` list (patch node 1).
+    # Services are normally append-only; a moved entry is expressed as
+    # remove + add. Existing entries are never re-serialized, so their client
+    # Control instances (and invoke listeners) survive.
+    def services_patch_ops(previous, current)
+      ops = []
+      working = previous.dup
+
+      (working.length - 1).downto(0) do |index|
+        next if current.any? { |service| service.equal?(working[index]) }
+
+        ops << [2, 1, index]
+        working.delete_at(index)
+      end
+
+      current.each_with_index do |service, index|
+        next if working[index]&.equal?(service)
+
+        existing = working.index { |candidate| candidate.equal?(service) }
+        if existing
+          ops << [2, 1, existing]
+          working.delete_at(existing)
+        end
+        ops << [1, 1, index, serialize_patch_value(service)]
+        working.insert(index, service)
+      end
+
+      ops
     end
 
     def push_dialogs_update!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruflet_core
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - AdamMusa
@@ -253,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.11
 specification_version: 4
 summary: Ruflet core runtime package.
 test_files: []