@things-factory/figure-ui 10.1.159 → 10.1.161

package/dist-client/modeller/figure-links.js

@@ -6,7 +6,7 @@ import './figure-slot-layout-panel.js';
 import { customElement, property, state } from 'lit/decorators.js';
 import { i18next, localize } from '@operato/i18n';
 import { FIGURE_FACES, figureFaceOverhangOf } from '@hatiolab/figure-model';
-import { acceptsOf, alignOf, AXES, canFasten, facesOf, canFollow, followCommandOf, followableAxes, positionIsShare, choiceOf, heldBy, followOf, hangsFrom, shownWhenOf, visibilityControlsOf, placeKeptOf, fasteningOf, hasInstanceSize, holdsThings, leadersFor, motionOf, motionFormOf, motionFormRefusalOf, endPlaceKeyOf, motionJoint, placeFacesOf, placeIdFor, placesOn, rowAxesOf, rowBlockOf, fixedJointOf, rowOf, positionsWorkedOut, fieldWordsOf, measureNow, ownFacesOf, alignRowsOf } from './links.js';
+import { acceptsOf, alignOf, AXES, canFasten, facesOf, canFollow, followCommandOf, followableAxes, positionIsShare, choiceOf, heldBy, followOf, hangsFrom, shownWhenOf, visibilityControlsOf, placeKeptOf, fasteningOf, fastenGapOf, hasInstanceSize, holdsThings, leadersFor, motionOf, motionFormOf, motionFormRefusalOf, endPlaceKeyOf, motionJoint, placeFacesOf, placeIdFor, placesOn, rowAxesOf, rowBlockOf, fixedJointOf, rowOf, positionsWorkedOut, fieldWordsOf, measureNow, ownFacesOf, alignRowsOf } from './links.js';
 import { SidePanelStyles } from '@things-factory/figure-viewer/dist-client/side-panel-styles.js';
 import './figure-fasten-drawing.js';
 import { faceViewOf, insideAlignmentOf, modeOf, myFaceFor, turnsInPlace } from './fasten-geometry.js';
@@ -23,6 +23,7 @@ const freshFasten = () => ({
     targetFace: 'top',
     facing: 'meet',
     gap: 0,
+    gapKept: undefined,
     twist: 0,
     align: {},
     alignMm: {},
@@ -397,11 +398,14 @@ let FigureLinks = class FigureLinks extends localize(i18next)(LitElement) {
     heldWords(asset) {
         const joint = (asset.joints ?? []).find(j => j.body1.part === this.partId);
         const face = joint ? i18next.t(endPlaceKeyOf(joint.body1)) : '';
-        const gap = typeof joint?.origin?.gap === 'number' ? joint.origin.gap : 0;
+        const gap = joint?.origin?.gap ?? 0;
+        const place = i18next.t(`figure.label.resize-place-${asset.placement ?? 'floor'}`);
         const where = !joint
             ? i18next.t('figure.text.held-by-rule')
             : 'plane' in joint.body0
-                ? i18next.t('figure.text.held-on-plane', { face, place: i18next.t(`figure.label.resize-place-${asset.placement ?? 'floor'}`), gap: String(gap) })
+                ? typeof gap === 'number'
+                    ? i18next.t('figure.text.held-on-plane', { face, place, gap: String(gap) })
+                    : i18next.t('figure.text.held-on-plane-worked-out', { face, place })
                 : i18next.t('figure.text.held-on-part', { face, other: joint.body0.part, otherFace: i18next.t(endPlaceKeyOf(joint.body0)) });
         return where;
     }
@@ -483,7 +487,7 @@ let FigureLinks = class FigureLinks extends localize(i18next)(LitElement) {
                 face: myFace,
                 to: f.toPlane ? { plane: 'mounting-plane' } : { part: f.target, face: targetFace },
                 ...(f.toPlane ? {} : { facing: f.facing }),
-                ...(f.gap ? { gap: f.gap } : {}),
+                ...fastenGapOf(f),
                 twist: f.twist,
                 ...(align ? { align } : {}),
                 replace: !!held
@@ -497,7 +501,11 @@ let FigureLinks = class FigureLinks extends localize(i18next)(LitElement) {
           for the default.
         */
         const detail = [
-            ...(f.gap ? [i18next.t('figure.text.fasten-summary-gap', { mm: String(f.gap) })] : []),
+            ...(f.gapKept !== undefined
+                ? [i18next.t('figure.text.fasten-summary-gap-worked-out')]
+                : f.gap
+                    ? [i18next.t('figure.text.fasten-summary-gap', { mm: String(f.gap) })]
+                    : []),
             ...(f.twist ? [i18next.t('figure.text.fasten-summary-twist', { degrees: String(f.twist) })] : [])
         ];
         /* Across the face, a row only where the drawing cannot set it: no drawing of the face, or a share or a field to follow. */
@@ -582,7 +590,13 @@ let FigureLinks = class FigureLinks extends localize(i18next)(LitElement) {
         ${alignRows.length ? this.renderAlignment(alignRows, settle) : nothing}
         <div form>
           <span>${i18next.t('figure.label.gap')}</span>
-          <input type="number" step="any" .value=${String(f.gap)} @change=${(e) => ((this.fasten = { ...f, gap: Number(e.target.value) || 0 }), settle())} />
+          <input
+            type="number"
+            step="any"
+            .value=${f.gapKept !== undefined ? '' : String(f.gap)}
+            placeholder=${f.gapKept !== undefined ? i18next.t('figure.label.follows-expression') : ''}
+            @change=${(e) => ((this.fasten = { ...f, gap: Number(e.target.value) || 0, gapKept: undefined }), settle())}
+          />
           <span>${i18next.t('figure.label.twist')}</span>
           <input type="number" step="any" .value=${String(f.twist)} @change=${(e) => ((this.fasten = { ...f, twist: Number(e.target.value) || 0 }), settle())} />
         </div>
@@ -607,7 +621,7 @@ let FigureLinks = class FigureLinks extends localize(i18next)(LitElement) {
         else if ('mode' in c)
             this.fasten = { ...f, face: c.mode === 'centre' ? 'centre' : f.face === 'centre' ? 'bottom' : f.face, facing: c.mode === 'flush' ? 'flush' : 'meet' };
         else if ('gap' in c)
-            this.fasten = { ...f, gap: c.gap };
+            this.fasten = { ...f, gap: c.gap, gapKept: undefined };
         else
             this.fasten = {
                 ...f,