react_on_rails 16.2.0.beta.3 → 16.2.0.beta.8

data/lib/react_on_rails/pro_helper.rb

@@ -2,10 +2,6 @@
 
 module ReactOnRails
   module ProHelper
-    IMMEDIATE_HYDRATION_PRO_WARNING = "[REACT ON RAILS] The 'immediate_hydration' feature requires a " \
-                                      "React on Rails Pro license. " \
-                                      "Please visit https://shakacode.com/react-on-rails-pro to learn more."
-
     # Generates the complete component specification script tag.
     # Handles both immediate hydration (Pro feature) and standard cases.
     def generate_component_script(render_options)
@@ -36,17 +32,12 @@ module ReactOnRails
                    component_specification_tag
                  end
 
-      pro_warning_badge = pro_warning_badge_if_needed(render_options.explicitly_disabled_pro_options)
-      "#{pro_warning_badge}\n#{spec_tag}".html_safe
+      spec_tag.html_safe
     end
 
     # Generates the complete store hydration script tag.
     # Handles both immediate hydration (Pro feature) and standard cases.
     def generate_store_script(redux_store_data)
-      pro_options_check_result = ReactOnRails::ProUtils.disable_pro_render_options_if_not_licensed(redux_store_data)
-      redux_store_data = pro_options_check_result[:raw_options]
-      explicitly_disabled_pro_options = pro_options_check_result[:explicitly_disabled_pro_options]
-
       store_hydration_data = content_tag(:script,
                                          json_safe_and_pretty(redux_store_data[:props]).html_safe,
                                          type: "application/json",
@@ -67,40 +58,7 @@ module ReactOnRails
                                   store_hydration_data
                                 end
 
-      pro_warning_badge = pro_warning_badge_if_needed(explicitly_disabled_pro_options)
-      "#{pro_warning_badge}\n#{store_hydration_scripts}".html_safe
-    end
-
-    def pro_warning_badge_if_needed(explicitly_disabled_pro_options)
-      return "" unless explicitly_disabled_pro_options.any?
-
-      disabled_features_message = disabled_pro_features_message(explicitly_disabled_pro_options)
-      warning_message = "[REACT ON RAILS] #{disabled_features_message}\n" \
-                        "Please visit https://shakacode.com/react-on-rails-pro to learn more."
-      puts warning_message
-      Rails.logger.warn warning_message
-
-      tooltip_text = "#{disabled_features_message} Click to learn more."
-
-      <<~HTML.strip
-        <a href="https://shakacode.com/react-on-rails-pro" target="_blank" rel="noopener noreferrer" title="#{tooltip_text}">
-          <div style="position: fixed; top: 0; right: 0; width: 180px; height: 180px; overflow: hidden; z-index: 9999; pointer-events: none;">
-            <div style="position: absolute; top: 50px; right: -40px; transform: rotate(45deg); background-color: rgba(220, 53, 69, 0.85); color: white; padding: 7px 40px; text-align: center; font-weight: bold; font-family: sans-serif; font-size: 12px; box-shadow: 0 2px 8px rgba(0,0,0,0.3); pointer-events: auto;">
-              React On Rails Pro Required
-            </div>
-          </div>
-        </a>
-      HTML
-    end
-
-    def disabled_pro_features_message(explicitly_disabled_pro_options)
-      return "".html_safe unless explicitly_disabled_pro_options.any?
-
-      feature_list = explicitly_disabled_pro_options.join(", ")
-      feature_word = explicitly_disabled_pro_options.size == 1 ? "feature" : "features"
-      "The '#{feature_list}' #{feature_word} " \
-        "#{explicitly_disabled_pro_options.size == 1 ? 'requires' : 'require'} a " \
-        "React on Rails Pro license. "
+      store_hydration_scripts.html_safe
     end
   end
 end

data/lib/react_on_rails/react_component/render_options.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "react_on_rails/utils"
-require "react_on_rails/pro_utils"
 
 module ReactOnRails
   module ReactComponent
@@ -15,13 +14,10 @@ module ReactOnRails
       # TODO: remove the required for named params
       def initialize(react_component_name: required("react_component_name"), options: required("options"))
         @react_component_name = react_component_name.camelize
-
-        result = ReactOnRails::ProUtils.disable_pro_render_options_if_not_licensed(options)
-        @options = result[:raw_options]
-        @explicitly_disabled_pro_options = result[:explicitly_disabled_pro_options]
+        @options = options
       end
 
-      attr_reader :react_component_name, :explicitly_disabled_pro_options
+      attr_reader :react_component_name
 
       def throw_js_errors
         options.fetch(:throw_js_errors, false)
@@ -100,7 +96,11 @@ module ReactOnRails
       end
 
       def immediate_hydration
-        retrieve_configuration_value_for(:immediate_hydration)
+        ReactOnRails::Utils.normalize_immediate_hydration(
+          options[:immediate_hydration],
+          react_component_name,
+          "Component"
+        )
       end
 
       def to_s

data/lib/react_on_rails/utils.rb

@@ -14,6 +14,46 @@ module ReactOnRails
       Rainbow('To see the full output, set FULL_TEXT_ERRORS=true.').red
     } ...\n".freeze
 
+    def self.immediate_hydration_pro_license_warning(name, type = "Component")
+      "[REACT ON RAILS] Warning: immediate_hydration: true requires a React on Rails Pro license.\n" \
+        "#{type} '#{name}' will fall back to standard hydration behavior.\n" \
+        "Visit https://www.shakacode.com/react-on-rails-pro/ for licensing information."
+    end
+
+    # Normalizes the immediate_hydration option value, enforcing Pro license requirements.
+    # Returns the normalized boolean value for immediate_hydration.
+    #
+    # @param value [Boolean, nil] The immediate_hydration option value
+    # @param name [String] The name of the component/store (for warning messages)
+    # @param type [String] The type ("Component" or "Store") for warning messages
+    # @return [Boolean] The normalized immediate_hydration value
+    # @raise [ArgumentError] If value is not a boolean or nil
+    #
+    # Logic:
+    # - Validates that value is true, false, or nil
+    # - If value is explicitly true (boolean) and no Pro license: warn and return false
+    # - If value is nil: return true for Pro users, false for non-Pro users
+    # - Otherwise: return the value as-is (allows explicit false to work)
+    def self.normalize_immediate_hydration(value, name, type = "Component")
+      # Type validation: only accept boolean or nil
+      unless [true, false, nil].include?(value)
+        raise ArgumentError,
+              "[REACT ON RAILS] immediate_hydration must be true, false, or nil. Got: #{value.inspect} (#{value.class})"
+      end
+
+      # Strict equality check: only trigger warning for explicit boolean true
+      if value == true && !react_on_rails_pro?
+        Rails.logger.warn immediate_hydration_pro_license_warning(name, type)
+        return false
+      end
+
+      # If nil, default based on Pro license status
+      return react_on_rails_pro? if value.nil?
+
+      # Return explicit value (including false)
+      value
+    end
+
     # https://forum.shakacode.com/t/yak-of-the-week-ruby-2-4-pathname-empty-changed-to-look-at-file-size/901
     # return object if truthy, else return nil
     def self.truthy_presence(obj)

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "16.2.0.beta.3"
+  VERSION = "16.2.0.beta.8"
 end