ruflet_core 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f384022aa476f52d7aa7e1315e1a5da2e71071cab839f04f7a0331cdb7da21f
-  data.tar.gz: f21fb7e4b2a9f401ef521d278128ac5b436d912182f2d1ddbcbb4b7597f4dfca
+  metadata.gz: d10c0b00cedaedd9a12709dd513e56aef545f9ba61b5756481e50b270ca647ce
+  data.tar.gz: 9a247d9aefdee2f5c667c3c5ae55235d17eb1a709c4dc402b0c794ecd5f0a752
 SHA512:
-  metadata.gz: f5ffaad8c7cee45c8b756d66d567e3a9e04c13dbb672dedb3c18545f7ecd6374af89b7267fc715711d73f8dc4b1fe3b9f597f5b62ca2fd9181f7dabb336178da
-  data.tar.gz: b52faf7ed1f6aa8980ba4c03e64c34c6b13760375261ef1e6121cf52eb774c035d8940d5d9cbb74f86de5174a768d758bba724fafa2f48a77aa1bc6a6d726524
+  metadata.gz: 18548e0fe324df386b50cb0d5320e70283d64385244f8cf2101c0add56dd62e9a2ae5a8a29fccb86bc058eef18ccd511efc8218305121d58dba7ba40de73639d
+  data.tar.gz: da7f855ee5f0721dbfb9ac249b6f34a7857e4a1e5e9ad2846fbb5954ae92b7c528aea6551796e6f1bcc2cec5ef7ad47aa75a7bdda48d18da3d82f6c94f9ceb56

data/lib/ruflet/version.rb

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

data/lib/ruflet_ui/ruflet/page.rb

@@ -160,6 +160,8 @@ module Ruflet
       @root_controls = []
       @views = []
       @dialogs = []
+      @overlay_container_mounted = false
+      @dialogs_container_mounted = false
       @services_container_mounted = false
       @visual_service_controls = {}
       @page_event_handlers = {}
@@ -248,10 +250,10 @@ module Ruflet
       controls.each { |c| register_control_tree(c, visited) }
       @root_controls = controls
 
-      @view_props["appbar"] = appbar if appbar
-      @view_props["bottom_appbar"] = bottom_appbar if bottom_appbar
-      @view_props["floating_action_button"] = floating_action_button if floating_action_button
-      @view_props["navigation_bar"] = navigation_bar if navigation_bar
+      update_view_slot("appbar", appbar)
+      update_view_slot("bottom_appbar", bottom_appbar)
+      update_view_slot("floating_action_button", floating_action_button)
+      update_view_slot("navigation_bar", navigation_bar)
       @dialog = dialog if dialog
       @snack_bar = snack_bar if snack_bar
       @bottom_sheet = bottom_sheet if bottom_sheet
@@ -482,11 +484,13 @@ module Ruflet
     def dialog=(value)
       @dialog = value
       refresh_dialogs_container!
+      push_dialogs_update! if @dialogs_container_mounted
     end
 
     def snack_bar=(value)
       @snack_bar = value
       refresh_dialogs_container!
+      push_dialogs_update! if @dialogs_container_mounted
     end
 
     def snackbar=(value)
@@ -508,6 +512,7 @@ module Ruflet
       return self if dialog_open?(dialog_control)
 
       dialog_control.props["open"] = true
+      remove_existing_singleton_dialogs(dialog_control)
       @dialogs << dialog_control unless @dialogs.include?(dialog_control)
       refresh_dialogs_container!
       send_view_patch unless @dialogs_container.wire_id
@@ -1145,11 +1150,22 @@ module Ruflet
       return nil unless dialog_control
 
       dialog_control.props["open"] = false
-      refresh_dialogs_container!
-      push_dialogs_update!
+      update(dialog_control, open: false)
       dialog_control
     end
 
+    def close_dialog(dialog_control)
+      return self unless dialog_control
+
+      before_dialog_count = @dialogs_container.props["controls"].length
+      dialog_control.props["open"] = false
+      @dialog = nil if @dialog.equal?(dialog_control)
+      remove_dialog_tracking(dialog_control)
+      refresh_dialogs_container!
+      push_dialogs_update!(force_view: @dialogs_container.props["controls"].length < before_dialog_count)
+      self
+    end
+
     def update(control_or_id = nil, **props)
       if control_or_id.nil? && props.empty?
         send_view_patch
@@ -1185,6 +1201,7 @@ module Ruflet
 
       visited = Set.new
       patch.each_value { |value| register_embedded_value(value, visited) }
+      patch.each { |k, v| control.props[k] = v }
 
       patch_ops = patch.map { |k, v| [0, 0, k, serialize_patch_value(v)] }
 
@@ -1207,8 +1224,6 @@ module Ruflet
       patch = normalize_props(props || {})
       patch.each { |k, v| control.props[k] = v }
 
-      remove_dialog_tracking(control) if patch.key?("open") && patch["open"] == false
-
       self
     end
 
@@ -1227,11 +1242,12 @@ module Ruflet
 
       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)
-      control.emit(name, event)
-
-      if name.to_s == "dismiss" && remove_dialog_tracking(control)
-        push_dialogs_update!
+      before_dialog_count = @dialogs_container.props["controls"].length
+      if dialog_close_event?(control, name) && remove_dialog_tracking(control)
+        push_dialogs_update!(force_view: @dialogs_container.props["controls"].length < before_dialog_count)
       end
+
+      control.emit(name, event)
     end
 
     def method_missing(name, *args, &block)
@@ -1370,6 +1386,14 @@ module Ruflet
       @sender.call(action, payload)
     end
 
+    def update_view_slot(name, value)
+      if value.nil?
+        @view_props.delete(name)
+      else
+        @view_props[name] = value
+      end
+    end
+
     def send_view_patch
       refresh_control_indexes!
       view_patches = build_view_patches
@@ -1379,10 +1403,12 @@ module Ruflet
         "id" => 1,
         "patch" => [
           [0],
-          [0, 0, "views", view_patches],
-          *page_patch_ops
+          *page_patch_ops,
+          [0, 0, "views", view_patches]
         ]
       })
+      @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
     end
 
@@ -1534,8 +1560,8 @@ module Ruflet
           end_value = range_value["end_value"] || range_value[:end_value]
           control.props["start_value"] = start_value unless start_value.nil?
           control.props["end_value"] = end_value unless end_value.nil?
-          return
         end
+        return
       end
 
       return if value.nil?
@@ -1582,7 +1608,7 @@ module Ruflet
     end
 
     def refresh_dialogs_container!
-      dialog_controls = (@dialogs + dialog_slots).uniq
+      dialog_controls = (dialog_slots + @dialogs).uniq
       @dialogs_container.props["controls"] = dialog_controls
       @page_props["_dialogs"] = @dialogs_container
     end
@@ -1608,9 +1634,15 @@ module Ruflet
       end
     end
 
-    def push_dialogs_update!
+    def push_dialogs_update!(force_view: false)
       refresh_control_indexes!
 
+      if force_view || @dialogs_container.props["controls"].empty?
+        @dialogs_container_mounted = false
+        send_view_patch
+        return
+      end
+
       if @dialogs_container.wire_id
         send_message(Protocol::ACTIONS[:patch_control], {
           "id" => @dialogs_container.wire_id,
@@ -1633,6 +1665,11 @@ module Ruflet
       @dialogs.include?(dialog_control) && dialog_control.props["open"] == true
     end
 
+    def dialog_close_event?(control, name)
+      name = name.to_s
+      name == "dismiss" || (%w[change select select_change].include?(name) && @dialogs.include?(control) && control.props["open"] == false)
+    end
+
     def remove_dialog_tracking(control)
       return false unless @dialogs.include?(control)
 
@@ -1641,6 +1678,16 @@ module Ruflet
       true
     end
 
+    def remove_existing_singleton_dialogs(control)
+      return unless singleton_dialog_control?(control)
+
+      @dialogs.delete_if { |dialog| dialog != control && singleton_dialog_control?(dialog) }
+    end
+
+    def singleton_dialog_control?(control)
+      control.type.to_s.tr("_", "").downcase == "snackbar"
+    end
+
     def assign_split_prop(key, value)
       if key == "vertical_alignment" || key == "horizontal_alignment"
         @page_props[key] = value
@@ -1668,8 +1715,8 @@ module Ruflet
         # Keep internal containers stable after initial mount.
         # Re-sending them as full objects can replace Control instances with
         # same IDs and detach service invoke listeners on the Flutter side.
-        next nil if k == "_overlay" && @overlay_container.wire_id
-        next nil if k == "_dialogs" && @dialogs_container.wire_id
+        next nil if k == "_overlay" && @overlay_container_mounted
+        next nil if k == "_dialogs" && @dialogs_container_mounted
         next nil if k == "_services" && @services_container_mounted
 
         [0, 0, k, serialize_patch_value(v)]

data/lib/ruflet_ui/ruflet/ui/controls/materials/audio_control.rb

@@ -44,10 +44,8 @@ module Ruflet
             runtime_page&.invoke(self, "pause", timeout: timeout, on_result: on_result)
           end
 
-          def play(position: nil, timeout: 10, on_result: nil)
-            args = {}
-            args["position"] = position unless position.nil?
-            runtime_page&.invoke(self, "play", args: args.empty? ? nil : args, timeout: timeout, on_result: on_result)
+          def play(position: 0, timeout: 10, on_result: nil)
+            runtime_page&.invoke(self, "play", args: { "position" => position }, timeout: timeout, on_result: on_result)
           end
 
           def release(timeout: 10, on_result: nil)

data/lib/ruflet_ui/ruflet/ui/controls/materials/map_controls.rb

@@ -4,14 +4,37 @@ module Ruflet
   module UI
     module Controls
       module RufletComponents
+        module MapValueNormalizer
+          private
+
+          def normalize_map_coordinate(value)
+            case value
+            when Array
+              if value.length == 2 && value.all? { |item| item.is_a?(Numeric) }
+                { "latitude" => value[0], "longitude" => value[1] }
+              else
+                value.map { |item| normalize_map_coordinate(item) }
+              end
+            when Hash
+              value.transform_keys(&:to_s).each_with_object({}) do |(key, item), result|
+                result[key] = normalize_map_coordinate(item)
+              end
+            else
+              value.respond_to?(:to_h) ? normalize_map_coordinate(value.to_h) : value
+            end
+          end
+        end
+
         class MapControl < Ruflet::Control
+          include MapValueNormalizer
+
           TYPE = "map".freeze
           WIRE = "Map".freeze
 
           def initialize(id: nil, layers: nil, initial_center: nil, initial_zoom: nil, min_zoom: nil, max_zoom: nil, interaction_configuration: nil, keep_alive: nil, bgcolor: nil, data: nil, expand: nil, height: nil, key: nil, visible: nil, width: nil, on_init: nil, on_long_press: nil, on_position_change: nil, on_secondary_tap: nil, on_tap: nil)
             props = {}
             props[:layers] = layers unless layers.nil?
-            props[:initial_center] = initial_center unless initial_center.nil?
+            props[:initial_center] = normalize_map_coordinate(initial_center) unless initial_center.nil?
             props[:initial_zoom] = initial_zoom unless initial_zoom.nil?
             props[:min_zoom] = min_zoom unless min_zoom.nil?
             props[:max_zoom] = max_zoom unless max_zoom.nil?
@@ -32,12 +55,52 @@ module Ruflet
             super(type: TYPE, id: id, **props)
           end
 
-          def center_on(coordinates, zoom: nil, timeout: 10, on_result: nil)
-            invoke_map("center_on", args: compact_args("coordinates" => coordinates, "zoom" => zoom), timeout: timeout, on_result: on_result)
+          def center_on(point = nil, coordinates: nil, zoom: nil, duration: nil, curve: nil, cancel_ongoing_animations: nil, timeout: 10, on_result: nil)
+            point ||= coordinates
+            invoke_map(
+              "center_on",
+              args: compact_args(
+                "point" => normalize_map_coordinate(point),
+                "zoom" => zoom,
+                "duration" => duration,
+                "curve" => curve,
+                "cancel_ongoing_animations" => cancel_ongoing_animations
+              ),
+              timeout: timeout,
+              on_result: on_result
+            )
+          end
+
+          def move_to(destination = nil, coordinates: nil, zoom: nil, rotation: nil, offset: nil, duration: nil, curve: nil, cancel_ongoing_animations: nil, timeout: 10, on_result: nil)
+            destination ||= coordinates
+            invoke_map(
+              "move_to",
+              args: compact_args(
+                "destination" => normalize_map_coordinate(destination),
+                "zoom" => zoom,
+                "rotation" => rotation,
+                "offset" => offset,
+                "duration" => duration,
+                "curve" => curve,
+                "cancel_ongoing_animations" => cancel_ongoing_animations
+              ),
+              timeout: timeout,
+              on_result: on_result
+            )
           end
 
-          def move_to(coordinates, zoom: nil, timeout: 10, on_result: nil)
-            invoke_map("move_to", args: compact_args("coordinates" => coordinates, "zoom" => zoom), timeout: timeout, on_result: on_result)
+          def zoom_to(zoom, duration: nil, curve: nil, cancel_ongoing_animations: nil, timeout: 10, on_result: nil)
+            invoke_map(
+              "zoom_to",
+              args: compact_args(
+                "zoom" => zoom,
+                "duration" => duration,
+                "curve" => curve,
+                "cancel_ongoing_animations" => cancel_ongoing_animations
+              ),
+              timeout: timeout,
+              on_result: on_result
+            )
           end
 
           def zoom_in(delta: nil, timeout: 10, on_result: nil)
@@ -118,12 +181,14 @@ module Ruflet
         end
 
         class MarkerControl < Ruflet::Control
+          include MapValueNormalizer
+
           TYPE = "marker".freeze
           WIRE = "Marker".freeze
 
           def initialize(id: nil, coordinates: nil, content: nil, height: nil, rotate: nil, width: nil, alignment: nil)
             props = {}
-            props[:coordinates] = coordinates unless coordinates.nil?
+            props[:coordinates] = normalize_map_coordinate(coordinates) unless coordinates.nil?
             props[:content] = content unless content.nil?
             props[:height] = height unless height.nil?
             props[:rotate] = rotate unless rotate.nil?
@@ -146,12 +211,14 @@ module Ruflet
         end
 
         class CircleMarkerControl < Ruflet::Control
+          include MapValueNormalizer
+
           TYPE = "circlemarker".freeze
           WIRE = "CircleMarker".freeze
 
           def initialize(id: nil, coordinates: nil, radius: nil, color: nil, border_color: nil, border_stroke_width: nil, use_radius_in_meter: nil)
             props = {}
-            props[:coordinates] = coordinates unless coordinates.nil?
+            props[:coordinates] = normalize_map_coordinate(coordinates) unless coordinates.nil?
             props[:radius] = radius unless radius.nil?
             props[:color] = color unless color.nil?
             props[:border_color] = border_color unless border_color.nil?
@@ -174,12 +241,14 @@ module Ruflet
         end
 
         class PolylineMarkerControl < Ruflet::Control
+          include MapValueNormalizer
+
           TYPE = "polylinemarker".freeze
           WIRE = "PolylineMarker".freeze
 
           def initialize(id: nil, coordinates: nil, color: nil, stroke_width: nil, border_color: nil, border_stroke_width: nil, gradient_colors: nil, stroke_cap: nil, stroke_join: nil)
             props = {}
-            props[:coordinates] = coordinates unless coordinates.nil?
+            props[:coordinates] = normalize_map_coordinate(coordinates) unless coordinates.nil?
             props[:color] = color unless color.nil?
             props[:stroke_width] = stroke_width unless stroke_width.nil?
             props[:border_color] = border_color unless border_color.nil?
@@ -204,12 +273,14 @@ module Ruflet
         end
 
         class PolygonMarkerControl < Ruflet::Control
+          include MapValueNormalizer
+
           TYPE = "polygonmarker".freeze
           WIRE = "PolygonMarker".freeze
 
           def initialize(id: nil, coordinates: nil, color: nil, border_color: nil, border_stroke_width: nil, disable_holes_border: nil, label: nil)
             props = {}
-            props[:coordinates] = coordinates unless coordinates.nil?
+            props[:coordinates] = normalize_map_coordinate(coordinates) unless coordinates.nil?
             props[:color] = color unless color.nil?
             props[:border_color] = border_color unless border_color.nil?
             props[:border_stroke_width] = border_stroke_width unless border_stroke_width.nil?

data/lib/ruflet_ui/ruflet/ui/services/ruflet/audio_recorder_control.rb

@@ -8,7 +8,7 @@ module Ruflet
           TYPE = "audiorecorder".freeze
           WIRE = "AudioRecorder".freeze
 
-          def initialize(id: nil, configuration: nil, data: nil, key: nil, on_state_change: nil, on_stream: nil, on_upload: nil)
+          def initialize(id: nil, configuration: {}, data: nil, key: nil, on_state_change: nil, on_stream: nil, on_upload: nil)
             props = {}
             props[:configuration] = configuration unless configuration.nil?
             props[:data] = data unless data.nil?
@@ -43,7 +43,7 @@ module Ruflet
             )
           end
 
-          def start_recording(output_path: nil, configuration: nil, upload: nil, timeout: 10, on_result: nil)
+          def start_recording(output_path: nil, configuration: {}, upload: nil, timeout: 10, on_result: nil)
             invoke_audio_recorder(
               "start_recording",
               args: compact_args(

data/lib/ruflet_ui/ruflet/ui/services/ruflet/permissionhandler_control.rb

@@ -44,6 +44,8 @@ module Ruflet
           end
 
           def normalize_service_value(value)
+            return value.to_s if value.is_a?(Symbol)
+
             value.respond_to?(:to_h) ? value.to_h.transform_keys(&:to_s) : value
           end
         end

data/lib/ruflet_ui/ruflet/ui/services/ruflet/securestorage_control.rb

@@ -23,6 +23,8 @@ module Ruflet
           end
 
           def set(key, value, **options)
+            raise ArgumentError, "value must not be nil" if value.nil?
+
             invoke_secure_storage("set", args: option_args(options).merge("key" => key, "value" => value), **invoke_options(options))
           end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruflet_core
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - AdamMusa