ea 0.6.64 → 0.6.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 357347a93b4240b35f3f0ea66e0e1200877e848b39e61b4d01e21e0276a67c04
-  data.tar.gz: b06de8c2dd2c0a7a2b4afbf599a583c15df3c369aab983e8466b94807c77efc8
+  metadata.gz: 8ffac6574d00714dc4cf15762c28295af8c894481163916699eae211557fb1be
+  data.tar.gz: d36e97707d7d1b961f807d13874484dcd92e6324467b80c6a0a07cddba0dcdf7
 SHA512:
-  metadata.gz: b702534b08da2779ea06bfe75a05b51c6d661999f59d3f6fadebee1785bebac67fed8a3a0dc93674cc64c9a4e01f1909e2f88f47dfb35165c4ff7c247585797d
-  data.tar.gz: 7914343f39b14550f47f4ca43390de0eb786101d20e9f4437076582e92db7f1e031a6365ba61d92a8a71fb2eca1700f8a13e3f96d8ed6b83f78b66daad42691f
+  metadata.gz: 5fa4eef593858195a555722364870e9c1d86a0305417fdf113ab905dce3201a2a22c75b97ffe1410482522eb705a491fd2afd0dda86dab5730cfe9dff7c394b0
+  data.tar.gz: b6a3d1b3c66e31d6e2a8b3113ccdf453d3a6a2f8c98c205dccfb74b3ecb6464383774f5fff9e830d13e68b26bb2558acf1157ba3da9919198e06020930ca957a

data/lib/ea/svg/ea_emitter/elements.rb

@@ -83,7 +83,7 @@ module Ea
           raw = element.bounds || element.image_bounds
           return unless raw
 
-          width = raw.width
+          width = context.bounds.width
           if classifier_package?(context.classifier)
             tab = Element::PackageShapeRenderer.autosized_tab_width(
               label: context.classifier.name.to_s,
@@ -118,38 +118,6 @@ module Ea
           size_unit = font_resolver.size_unit_for(element)
           parent_name = off_canvas_parent_name_for(classifier)
 
-          header_lines = classifier ? Element::HeaderLines.for(classifier,
-                                                                diagram_package_id: diagram.package_id,
-                                                                visually_nested: visually_nested?(element),
-                                                                umldi_keyword: element.umldi_keyword,
-                                                                bounds_width: raw_bounds&.width,
-                                                                font_size: size,
-                                                                family: family,
-                                                                off_canvas_parent_name: parent_name,
-                                                                foreign_package_name: foreign_package_name_for(classifier),
-                                                                suppress_stereotypes: suppress_stereotypes?) : []
-          # Regenerated contexts (SuppressFOC=0) re-size EVERY box to
-          # fit ALL content (7F10BFBD: Set enum box stored 70x59 ->
-          # EA 165x223 with all six literals unwrapped): width =
-          # max(stored, title + pad_t, widest row + 8), height likewise
-          # grows via the standard content growth. Frozen contexts
-          # (SuppressFOC=1) keep stored sizes and wrap.
-          if regenerated_context? && classifier.is_a?(Ea::Model::Classifier) &&
-             !classifier.is_a?(Ea::Model::Package)
-            preview_lines = []
-            if show_attributes? && attributes_visible?(element) &&
-               !classifier.is_a?(Ea::Model::Interface)
-              preview_lines += Element::AttributeRenderer.lines_for(
-                classifier, lookup: attribute_lookup,
-                exclude_association_ids: drawn_association_ids
-              )
-            end
-            if show_operations? && operations_visible?(element)
-              preview_lines += Element::OperationRenderer.lines_for(classifier)
-            end
-            bounds = context_resized_bounds(bounds, classifier, size, family,
-                                            preview_lines)
-          end
 
           is_classifier = classifier.is_a?(Ea::Model::Classifier)
           # Interfaces DO render attribute compartments when they own
@@ -171,6 +139,31 @@ module Ea
                       else
                         []
                       end
+          # Regenerated contexts grow the DRAWN width to fit the
+          # widest row: attr rows inset 22 + 5 right, op rows inset
+          # 22 + 3 (CharacterString 197+27=224, Integer 92+25=117).
+          # Titles never drive growth - they wrap instead.
+          if attr_lines.any? || op_lines.any?
+            row_w = [row_content_width(attr_lines, 5, size, family),
+                     row_content_width(op_lines, 3, size, family)].compact.max
+            if row_w && row_w > bounds.width
+              bounds = Ea::Model::Bounds.new(
+                x: bounds.x, y: bounds.y,
+                width: row_w,
+                height: bounds.height
+              )
+            end
+          end
+          header_lines = classifier ? Element::HeaderLines.for(classifier,
+                                                                diagram_package_id: diagram.package_id,
+                                                                visually_nested: visually_nested?(element),
+                                                                umldi_keyword: element.umldi_keyword,
+                                                                bounds_width: bounds.width,
+                                                                font_size: size,
+                                                                family: family,
+                                                                off_canvas_parent_name: parent_name,
+                                                                foreign_package_name: foreign_package_name_for(classifier),
+                                                                suppress_stereotypes: suppress_stereotypes?) : []
           geometry = compartment_geometry(bounds, size, attr_lines, op_lines,
                                            tagged_values_for(classifier).size,
                                            header_lines, classifier: classifier,
@@ -278,6 +271,20 @@ module Ea
           )
         end
 
+        def row_content_width(lines, right_pad, size, family)
+          return nil if lines.to_a.empty?
+
+          tl = lines.filter_map do |line|
+            text = line.sub(/\A\S /, "")
+            Ea::Fonts::Metrics.text_length(text, size,
+                                           family: family,
+                                           weight: "400")&.round
+          end.max
+          return nil unless tl
+
+          22 + tl + right_pad
+        end
+
         def compartment_geometry(bounds, size, attr_lines, op_lines,
                                  tagged_count, header_lines, classifier: nil,
                                  constraints_count: 0, marker_count: 0,
@@ -469,29 +476,6 @@ module Ea
             diagram.style_ex.to_s !~ /SuppressFOC=1/
         end
 
-        TITLE_PAD = 18
-
-        def context_resized_bounds(bounds, classifier, size, family, rows)
-          label = classifier.name.to_s
-          pkg = foreign_package_name_for(classifier)
-          label = "#{pkg}::#{label}" if pkg
-          title_w = TextRenderer.estimate_width(
-            label, size, nil, family: family, weight: "700"
-          ).round
-          pad = title_w.odd? ? TITLE_PAD : 16
-          row_w = rows.map do |line|
-            line = line.sub(/\A«[^»]*»\z/, "")
-            TextRenderer.estimate_width(
-              line, size, nil, family: family, weight: "400"
-            ).round + 8
-          end.max.to_i
-          needed = [bounds.width, title_w + pad, row_w].max
-          return bounds if needed <= bounds.width
-
-          Ea::Model::Bounds.new(x: bounds.x, y: bounds.y,
-                                width: needed, height: bounds.height)
-        end
-
         def foreign_package_name_for(classifier)
           return nil unless diagram.show_foreign
           return nil unless classifier.is_a?(Ea::Model::Classifier)

data/lib/ea/version.rb

@@ -4,5 +4,5 @@ module Ea
   # Gem release version. Extracted to its own file so the
   # `gem-release` tool's `gem bump` can find and update it via the
   # standard `lib/<gem>/version.rb` convention.
-  VERSION = "0.6.64"
+  VERSION = "0.6.65"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.64
+  version: 0.6.65
 platform: ruby
 authors:
 - Ribose Inc.