ariadne_view_components 0.0.51 → 0.0.53

data/app/assets/javascripts/components/ariadne/options_controller/options_controller.d.ts

@@ -30,10 +30,9 @@ export default class OptionsController extends SyncedBooleanAttributesController
     activeOptionsValue: TActiveOptions;
     readonly isMultiValue: boolean;
     readonly toggleableValue: boolean;
-    optionTargetLookup: Map<Element, TOptionKey>;
     select(event: Event, updateTo?: TOutletChangeData<TActiveOptions>): void;
-    optionsTargetConnected(element: Element): void;
-    getValueForElement(element: Element): boolean | null;
+    optionTargetConnected(element: Element): void;
+    getValueForElement(element: Element): boolean;
     getState(): TActiveOptions;
     outletUpdate: (event: Event, updateTo?: TOutletChangeData<TActiveOptions>) => void;
 }

data/app/components/ariadne/options_controller/options_controller.d.ts

@@ -30,10 +30,9 @@ export default class OptionsController extends SyncedBooleanAttributesController
     activeOptionsValue: TActiveOptions;
     readonly isMultiValue: boolean;
     readonly toggleableValue: boolean;
-    optionTargetLookup: Map<Element, TOptionKey>;
     select(event: Event, updateTo?: TOutletChangeData<TActiveOptions>): void;
-    optionsTargetConnected(element: Element): void;
-    getValueForElement(element: Element): boolean | null;
+    optionTargetConnected(element: Element): void;
+    getValueForElement(element: Element): boolean;
     getState(): TActiveOptions;
     outletUpdate: (event: Event, updateTo?: TOutletChangeData<TActiveOptions>) => void;
 }

data/app/components/ariadne/options_controller/options_controller.js

@@ -9,7 +9,6 @@ class OptionsController extends SyncedBooleanAttributesController {
     constructor() {
         super(...arguments);
         _OptionsController_instances.add(this);
-        this.optionTargetLookup = new Map();
         this.outletUpdate = this.select;
     }
     select(event, updateTo = {}) {
@@ -31,20 +30,19 @@ class OptionsController extends SyncedBooleanAttributesController {
         }
         this.sendToOutlets(event, Object.assign(Object.assign({}, updateTo), { data: this.activeOptionsValue }));
     }
-    optionsTargetConnected(element) {
+    optionTargetConnected(element) {
         const key = __classPrivateFieldGet(this, _OptionsController_instances, "m", _OptionsController_getElementKey).call(this, element);
-        if (this.doesElementHaveOnAttrs(element)) {
+        const isActive = this.activeOptionsValue[key] || this.doesElementHaveOnAttrs(element);
+        if (isActive) {
             __classPrivateFieldGet(this, _OptionsController_instances, "m", _OptionsController_activateKey).call(this, key);
         }
         else {
             __classPrivateFieldGet(this, _OptionsController_instances, "m", _OptionsController_deactivateKey).call(this, key);
         }
+        this.updateAttributesForElement(element, isActive);
     }
     getValueForElement(element) {
         var _a;
-        if (!this.optionTargetLookup.has(element)) {
-            return null;
-        }
         const optionKey = __classPrivateFieldGet(this, _OptionsController_instances, "m", _OptionsController_getElementKey).call(this, element);
         return (_a = this.activeOptionsValue[optionKey]) !== null && _a !== void 0 ? _a : false;
     }

data/app/components/ariadne/options_controller/options_controller.ts

@@ -29,8 +29,6 @@ export default class OptionsController
   declare readonly isMultiValue: boolean
   declare readonly toggleableValue: boolean
 
-  optionTargetLookup: Map<Element, TOptionKey> = new Map()
-
   select(event: Event, updateTo: TOutletChangeData<TActiveOptions> = {}) {
     const activeOptions = updateTo.data
     for (let index in this.optionTargets) {
@@ -53,13 +51,16 @@ export default class OptionsController
     this.sendToOutlets(event, {...updateTo, data: this.activeOptionsValue})
   }
 
-  optionsTargetConnected(element: Element) {
+  optionTargetConnected(element: Element) {
     const key = this.#getElementKey(element)
-    if (this.doesElementHaveOnAttrs(element)) {
+    const isActive = this.activeOptionsValue[key] || this.doesElementHaveOnAttrs(element)
+    if (isActive) {
       this.#activateKey(key)
     } else {
       this.#deactivateKey(key)
     }
+
+    this.updateAttributesForElement(element, isActive)
   }
 
   #shouldChangeState(isCurrentlyActive: boolean, wasSelected: boolean) {
@@ -104,10 +105,6 @@ export default class OptionsController
   }
 
   getValueForElement(element: Element) {
-    if (!this.optionTargetLookup.has(element)) {
-      return null
-    }
-
     const optionKey = this.#getElementKey(element)
     return this.activeOptionsValue[optionKey] ?? false
   }

data/app/components/ariadne/string_match_controller/string_match_controller.ts

@@ -30,6 +30,7 @@ export default class StringMatchController
     this.#compareKeywordToTargets()
     this.sendToOutlets(event, {...updateTo, data: this.keywordValue})
   }
+
   #compareKeywordToTargets() {
     if (this.hasMatchTarget) {
       let foundMatch = false

data/app/lib/ariadne/fetch_or_fallback_helper.rb

@@ -59,7 +59,7 @@ module Ariadne
 
       unless silence_warnings?
         message = <<~MSG
-          Ariadne: note that `#{preferred_tag}` is the preferred tag here;
+          Ariadne: note that `#{preferred_tag}` is the preferred tag for `#{self.class.name}`;
           you passed `#{given_tag}` (which will still be used)
         MSG
 
@@ -75,7 +75,7 @@ module Ariadne
 
       unless silence_warnings?
         message = <<~MSG
-          Ariadne: note that `#{preferred_attribute}` is the preferred attribute here;
+          Ariadne: note that `#{preferred_attribute}` is the preferred attribute for `#{self.class.name}`;
           you passed `#{given_attribute}` (which will still be used)
         MSG
 

data/lib/ariadne/view_components/linters/autocorrectable.rb

@@ -15,7 +15,7 @@ module ERBLint
       end
 
       def correction(args)
-        return nil if args.nil?
+        return if args.nil?
 
         correction = "<%= render #{self.class::COMPONENT}.new"
         correction += "(#{args})" if args.present?

data/lib/ariadne/view_components/linters/base_linter.rb

@@ -159,13 +159,13 @@ module ERBLint
         # Unless explicitly set, we don't want to mark correctable offenses if the counter is correct.
         if !@config.override_ignores_if_correctable? && expected_count == @total_offenses
           clear_offenses
-          return
+          return false
         end
 
         if @offenses_not_corrected.zero?
           # have to adjust to get `\n` so we delete the whole line
           add_offense(processed_source.to_source_range(comment_node.loc.adjust(end_pos: 1)), "Unused erblint:count comment for #{rule_name}", "") if comment_node
-          return
+          return false
         end
 
         first_offense = @offenses[0]

data/lib/ariadne/view_components/version.rb

@@ -3,6 +3,6 @@
 # :nocov:
 module Ariadne
   module ViewComponents
-    VERSION = "0.0.51"
+    VERSION = "0.0.53"
   end
 end

data/lib/rubocop/cop/ariadne/base_cop.rb

@@ -12,7 +12,7 @@ module RuboCop
         # We only verify SystemArguments if it's a `.new` call on a component or
         # a ViewHeleper call.
         def valid_node?(node)
-          return if node.nil?
+          return false if node.nil?
 
           view_helpers.include?(node.method_name) || (node.method_name == :new && !node.receiver.nil? && ::Ariadne::ViewComponents::STATUSES.key?(node.receiver.const_name))
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ariadne_view_components
 version: !ruby/object:Gem::Version
-  version: 0.0.51
+  version: 0.0.53
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-30 00:00:00.000000000 Z
+date: 2023-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tailwind_merge
@@ -341,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.15
+rubygems_version: 3.4.16
 signing_key: 
 specification_version: 4
 summary: ViewComponents for the Ariadne Design System