altium-toolkit 1.1.35 → 1.1.37

package/src/ui/PcbScene3dStaticBodySymmetryRecovery.mjs

@@ -643,10 +643,31 @@ export class PcbScene3dStaticBodySymmetryRecovery {
      */
     static #bodyFamilyKey(componentBody) {
         const geometry = componentBody?.staticGeometry || {}
+        const identityKey = [componentBody?.identifier, componentBody?.name]
+            .map((value) =>
+                String(value ?? '')
+                    .trim()
+                    .toLowerCase()
+            )
+            .filter(Boolean)
+            .join('|')
+        const anonymousModelKey = identityKey
+            ? ''
+            : [componentBody?.modelId, componentBody?.checksum]
+                  .map((value) =>
+                      String(value ?? '')
+                          .trim()
+                          .toLowerCase()
+                  )
+                  .filter(Boolean)
+                  .join('|')
+        const bodyIdentityKey = identityKey || anonymousModelKey
+        if (!bodyIdentityKey) {
+            return ''
+        }
 
         return [
-            componentBody?.identifier,
-            componentBody?.name,
+            bodyIdentityKey,
             geometry.kind,
             PcbScene3dStaticBodySymmetryRecovery.#numberKey(geometry.heightMil),
             PcbScene3dStaticBodySymmetryRecovery.#numberKey(

package/src/ui/SchematicColorResolver.mjs

@@ -73,6 +73,12 @@ export class SchematicColorResolver {
         fallbackVariable,
         preserveUnknown = false
     ) {
+        const normalized = SchematicColorResolver.#normalizeColor(color)
+
+        if (SchematicColorResolver.#isNearBlackSourceColor(normalized)) {
+            return SchematicColorResolver.#toVariable(fallbackVariable)
+        }
+
         const resolved = SchematicColorResolver.resolveColor(
             color,
             fallbackVariable,
@@ -127,6 +133,29 @@ export class SchematicColorResolver {
             : SchematicColorResolver.#toVariable(fallbackVariable)
     }
 
+    /**
+     * Resolves one non-text fill, using schematic ink when source artwork only
+     * supplies the default black text color.
+     * @param {string | undefined} fill
+     * @param {string} fallbackVariable
+     * @param {boolean} [preserveUnknown]
+     * @returns {string}
+     */
+    static resolveNonTextFill(fill, fallbackVariable, preserveUnknown = false) {
+        const resolved = SchematicColorResolver.resolveFill(
+            fill,
+            fallbackVariable,
+            preserveUnknown
+        )
+
+        return resolved ===
+            SchematicColorResolver.#toVariable('--schematic-text-color')
+            ? SchematicColorResolver.#toVariable(
+                  '--schematic-default-ink-color'
+              )
+            : resolved
+    }
+
     /**
      * Resolves an explicitly authored source stroke color without mapping it to
      * a semantic theme token.
@@ -272,6 +301,21 @@ export class SchematicColorResolver {
         }
     }
 
+    /**
+     * Returns true for very dark source colors that usually mean default
+     * schematic text black rather than an intentional artwork color.
+     * @param {string} color Normalized color.
+     * @returns {boolean}
+     */
+    static #isNearBlackSourceColor(color) {
+        const rgb = SchematicColorResolver.#parseHexColor(color)
+        if (!rgb) {
+            return false
+        }
+
+        return Math.max(rgb.r, rgb.g, rgb.b) <= 32
+    }
+
     /**
      * Converts RGB channels to HSL.
      * @param {{ r: number, g: number, b: number }} color

package/src/ui/SchematicLineColorResolver.mjs

@@ -35,7 +35,7 @@ export class SchematicLineColorResolver {
                   )
         }
 
-        return SchematicColorResolver.resolveColor(
+        return SchematicColorResolver.resolveNonTextColor(
             line?.color,
             '--schematic-default-ink-color'
         )

package/src/ui/SchematicShapeRenderer.mjs

@@ -42,7 +42,7 @@ export class SchematicShapeRenderer {
             ) +
             '" fill="' +
             escapeHtml(
-                SchematicColorResolver.resolveFill(
+                SchematicColorResolver.resolveNonTextFill(
                     polygon.fill || 'none',
                     '--schematic-fill-color',
                     true
@@ -50,7 +50,7 @@ export class SchematicShapeRenderer {
             ) +
             '" stroke="' +
             escapeHtml(
-                SchematicColorResolver.resolveColor(
+                SchematicColorResolver.resolveNonTextColor(
                     polygon.color,
                     '--schematic-default-ink-color'
                 )
@@ -128,7 +128,7 @@ export class SchematicShapeRenderer {
             escapeHtml(path) +
             '" stroke="' +
             escapeHtml(
-                SchematicColorResolver.resolveColor(
+                SchematicColorResolver.resolveNonTextColor(
                     bezier.color,
                     '--schematic-default-ink-color'
                 )
@@ -205,7 +205,7 @@ export class SchematicShapeRenderer {
             escapeHtml(path) +
             '" fill="' +
             escapeHtml(
-                SchematicColorResolver.resolveFill(
+                SchematicColorResolver.resolveNonTextFill(
                     SchematicShapeRenderer.#resolveSchematicPieFill(pie),
                     '--schematic-fill-color',
                     true
@@ -213,7 +213,7 @@ export class SchematicShapeRenderer {
             ) +
             '" stroke="' +
             escapeHtml(
-                SchematicColorResolver.resolveColor(
+                SchematicColorResolver.resolveNonTextColor(
                     pie.color,
                     '--schematic-default-ink-color'
                 )
@@ -256,7 +256,7 @@ export class SchematicShapeRenderer {
                           fill,
                           '--schematic-fill-color'
                       )
-                    : SchematicColorResolver.resolveFill(
+                    : SchematicColorResolver.resolveNonTextFill(
                           fill,
                           '--schematic-fill-color'
                       )
@@ -268,7 +268,7 @@ export class SchematicShapeRenderer {
                           rectangle.color,
                           '--schematic-default-ink-color'
                       )
-                    : SchematicColorResolver.resolveColor(
+                    : SchematicColorResolver.resolveNonTextColor(
                           rectangle.color,
                           '--schematic-default-ink-color'
                       )
@@ -321,7 +321,7 @@ export class SchematicShapeRenderer {
                           fill,
                           '--schematic-fill-color'
                       )
-                    : SchematicColorResolver.resolveFill(
+                    : SchematicColorResolver.resolveNonTextFill(
                           fill,
                           '--schematic-fill-color'
                       )
@@ -333,7 +333,7 @@ export class SchematicShapeRenderer {
                           rectangle.color,
                           '--schematic-default-ink-color'
                       )
-                    : SchematicColorResolver.resolveColor(
+                    : SchematicColorResolver.resolveNonTextColor(
                           rectangle.color,
                           '--schematic-default-ink-color'
                       )
@@ -361,7 +361,7 @@ export class SchematicShapeRenderer {
         const x = Number(symbol?.x || 0)
         const y = projectSchematicY(sheetHeight, Number(symbol?.y || 0))
         const color = escapeHtml(
-            SchematicColorResolver.resolveColor(
+            SchematicColorResolver.resolveNonTextColor(
                 symbol.color,
                 '--schematic-default-ink-color'
             )
@@ -422,7 +422,7 @@ export class SchematicShapeRenderer {
             path +
             '" stroke="' +
             escapeHtml(
-                SchematicColorResolver.resolveColor(
+                SchematicColorResolver.resolveNonTextColor(
                     arc.color,
                     '--schematic-default-ink-color'
                 )
@@ -451,7 +451,7 @@ export class SchematicShapeRenderer {
             formatNumber(Math.max(Number(ellipse.radiusY) || 0, 0.8)) +
             '" fill="' +
             escapeHtml(
-                SchematicColorResolver.resolveFill(
+                SchematicColorResolver.resolveNonTextFill(
                     SchematicShapeRenderer.#resolveSchematicEllipseFill(
                         ellipse
                     ),
@@ -460,7 +460,7 @@ export class SchematicShapeRenderer {
             ) +
             '" stroke="' +
             escapeHtml(
-                SchematicColorResolver.resolveColor(
+                SchematicColorResolver.resolveNonTextColor(
                     ellipse.color,
                     '--schematic-default-ink-color'
                 )