@things-factory/figure-ui 10.1.82 → 10.1.83

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/figure-ui",
-  "version": "10.1.82",
+  "version": "10.1.83",
   "publishConfig": {
     "access": "public",
     "@things-factory:registry": "https://registry.npmjs.org"
@@ -44,5 +44,5 @@
     "@things-factory/figure-service": "^10.1.82",
     "three": "^0.185.1"
   },
-  "gitHead": "263d0247111fbffb02d7122864df0b61bda99461"
+  "gitHead": "b01824bdb3fd266eac06a7241941ac0a119a6e5d"
 }

package/test/links.test.ts

@@ -331,7 +331,8 @@ test('붙여도 제자리 — 폼은 지금 서 있는 자리를 가운데서
   row = applyFigureAuthoring(row, { kind: 'attach', part: 'cap', face: 'bottom', to: { part: 'roller', face: 'top' } })
   assert.deepEqual([hangsFrom(row, 'roller', 'plate'), hangsFrom(row, 'cap', 'plate'), hangsFrom(row, 'plate', 'roller')], [true, true, false])
   const form = read('../client/modeller/figure-links.ts')
-  assert.equal(form.match(/this\.aimAt\(asset, \{ \.\.\.f, (toPlane|target|targetFace):/g)?.length, 3, '바닥 · 상대 부품 · 상대 면을 바꿀 때마다')
+  assert.equal(form.match(/this\.aimAt\(asset, \{ \.\.\.f, (target|targetFace):/g)?.length, 2, '상대 부품 · 상대 면을 바꿀 때마다')
+  assert.ok(!form.includes("figure.label.stands-on-plane"), '부품 붙이기 폼에 모델 설치 기준을 섞지 않는다')
   /* Kept in the list, not choosable, with the reason (ADR-0097 §5.5). */
   assert.ok(form.includes('const loops = (one: string) => hangsFrom(asset, one, this.partId)'))
   assert.ok(form.includes("html`<option value=${one} disabled>${i18next.t('figure.text.target-would-loop'"))

package/test/resize-with-placement.test.ts

@@ -91,23 +91,23 @@ test('fresh, width only, and all set back to fixed are three different answers',
   const following = applyFigureAuthoring(a, { kind: 'follow-size', part: 'box', axes: ['y'] })
   assert.deepEqual(resizeAxesOf(following, 'box'), { axes: ['y'], basis: 'chosen' })
   assert.deepEqual(resizeAxesOf(following, 'box', ['x']), { axes: ['x', 'y'], basis: 'chosen' })
-  /* The screen: the button passes the axes, the button names its scope, and "none" disables it. */
+  /* The screen: size response is no longer a disguised placement command. */
   const links = readFileSync(new URL('../client/modeller/figure-links.ts', import.meta.url), 'utf-8')
-  assert.ok(links.includes("detail: { request: { part: this.partId, axes, ...(gap ? { gap } : {}) } }"))
-  assert.ok(links.includes("i18next.t('figure.button.resize-scoped-' + mode, { scope })"))
-  assert.ok(links.includes("?disabled=${choice.basis === 'none'"))
-  assert.ok(links.includes('this.pendingAxes = { ...this.pendingAxes, [this.partId]: axes.filter(one => one !== axis) }'), 'set back to fixed is remembered as a choice')
+  const dimensions = links.slice(links.indexOf('  private renderDimensions('), links.indexOf('  /** The same source'))
+  assert.ok(dimensions.includes("this.command({ kind: 'follow-size', part: this.partId })"))
+  assert.ok(!dimensions.includes('resize-with-placement'), 'size response does not attach the part')
+  assert.ok(!links.includes('figure.label.stands-on-plane'), 'the attachment form does not present a model-placement toggle')
   const ko = JSON.parse(readFileSync(new URL('../translations/ko.json', import.meta.url), 'utf-8'))
-  assert.equal(ko['figure.text.resize-scope-all-3'], '세 방향 모두')
+  assert.equal(ko['figure.button.follow-size'], '모델 크기에 맞추기')
 })
 
-test('a part off the floor is offered both, with the distance: keep the gap, or be brought onto the floor', () => {
+test('a part off the floor is not moved by choosing its size response', () => {
   let a = addFigureBox(createFigureAsset('UX'), { id: 'shelf', size: { x: 400, y: 40, z: 300 }, position: { x: 0, y: 520, z: 0 } })
   a = applyFigureAuthoring(a, { kind: 'declare-occupancy', proposal: proposeFigureOccupancy(a), placement: 'floor' })
   const asked = planFigureResize(a, { part: 'shelf', axes: resizeAxesOf(a, 'shelf').axes })
   assert.deepEqual([asked.refusal?.code, asked.refusal?.mm], ['GAP_CHOICE', 500])
   const links = readFileSync(new URL('../client/modeller/figure-links.ts', import.meta.url), 'utf-8')
-  assert.ok(links.includes("@click=${() => ask('keep')}") && links.includes("@click=${() => ask('plane')}"), 'two buttons, each a choice')
+  assert.ok(!links.includes("@click=${() => ask('keep')}"), 'the UI does not offer a size command that also moves the part')
 })
 
 test('a field only the room reads is taken out of the part\'s position row and shown apart', () => {
@@ -164,10 +164,11 @@ test('a fastened part keeps its position and turn rows, with the numbers the rul
   assert.ok(!editor.includes('value="—" disabled'), 'not a blank')
 })
 
-test('after "follow size, attached" the part says what holds it, not a refusal', () => {
+test('size response and attachment are separate screen paths', () => {
   const links = readFileSync(new URL('../client/modeller/figure-links.ts', import.meta.url), 'utf-8')
-  assert.ok(links.includes('? this.renderHeld(asset)'))
-  assert.ok(!links.includes("<p hint resize-held>${i18next.t('figure.text.resize-refused-held'"))
+  assert.ok(links.includes('figure.button.fasten-start'))
+  assert.ok(links.includes('figure.label.target-part-placeholder'))
+  assert.ok(!links.includes('? this.renderHeld(asset)'))
   const ko = JSON.parse(readFileSync(new URL('../translations/ko.json', import.meta.url), 'utf-8'))
   assert.equal(ko['figure.text.held-on-plane'].replace('{face}', '아랫면').replace('{place}', '바닥').replace('{gap}', '0'), '아랫면을 바닥에 유지 중 (간격 0 mm)')
 })

package/translations/en.json

@@ -200,7 +200,7 @@
   "figure.label.shown-always": "always",
   "figure.label.shown-while": "while {control} is at least",
   "figure.label.shown-at-least": "at least",
-  "figure.button.follow-size": "follow the figure size",
+  "figure.button.follow-size": "Match model size",
   "figure.text.size-declared-to-follow": "the figure size to follow was set from its parts: {x} × {y} × {z} mm.",
   "figure.label.recipes": "recipes",
   "figure.text.recipe-needs-a-part": "choose the part to put it on first.",
@@ -731,7 +731,8 @@
   "figure.label.resize-z": "Depth (Z)",
   "figure.label.resize-custom": "Linked to another rule",
   "figure.label.resize-following": "Follows equipment size",
-  "figure.label.resize-advanced": "Link to other parts · Advanced",
+  "figure.label.resize-advanced": "Choose size response",
+  "figure.text.resize-all-following": "This part changes with the model size.",
   "figure.text.resize-uniform-warning": "This equipment uses uniform scaling, which takes precedence over individual axis changes. Switching this mode is not yet available.",
   "figure.text.preview-setup": "Not resizing as expected? Choose a part to set which dimensions follow and where it stays attached. Preview controls do not change the saved model.",
   "figure.label.resize-part": "Part to configure",
@@ -829,6 +830,11 @@
   "figure.label.model-settings": "Model settings",
   "figure.text.fasten-editing": "Editing the current attachment: its {face} on {target}",
   "figure.text.fasten-new": "Attach anew",
+  "figure.text.fasten-start": "Attach this part to a face on another part so they keep their relationship when either changes.",
+  "figure.button.fasten-start": "Attach to another part",
+  "figure.label.target-part-placeholder": "Choose a part",
+  "figure.text.fasten-target-first": "Choose the part to attach to first.",
+  "figure.text.fasten-edit-on-plane": "This part is connected to the model's placement reference. Detach it before attaching it to another part.",
   "figure.button.fasten-update": "Update this attachment",
   "figure.button.align-to-floor": "Align to the floor",
   "figure.button.align-to-ceiling": "Align to the ceiling",

package/translations/ja.json

@@ -731,7 +731,8 @@
   "figure.label.resize-z": "奥行き (Z)",
   "figure.label.resize-custom": "別の規則に連結",
   "figure.label.resize-following": "図形と一緒に変わる",
-  "figure.label.resize-advanced": "他の部品と連結 · 詳細設定",
+  "figure.label.resize-advanced": "サイズの反応を設定",
+  "figure.text.resize-all-following": "この部品のサイズはモデルのサイズに合わせて変わります。",
   "figure.text.resize-uniform-warning": "この図形は全体を一つの比率で拡大します。方向ごとの変更より全体の比率が優先されます。この方式の切り替えはまだ提供されていません。",
   "figure.text.preview-setup": "思った通りにサイズが変わりませんか? 部品を選んで、伸びる方向と付いている場所を設定してください。この画面の操作値は保存されたモデルを変えません。",
   "figure.label.resize-part": "サイズ追従を設定する部品",
@@ -829,6 +830,11 @@
   "figure.label.model-settings": "モデル設定",
   "figure.text.fasten-editing": "現在の取り付けを編集: {face}を{target}に",
   "figure.text.fasten-new": "新しく取り付ける",
+  "figure.text.fasten-start": "別の部品の面に取り付けると、相手の部品が変わっても関係を保ちます。",
+  "figure.button.fasten-start": "別の部品に取り付ける",
+  "figure.label.target-part-placeholder": "取り付ける部品を選択",
+  "figure.text.fasten-target-first": "先に取り付ける部品を選んでください。",
+  "figure.text.fasten-edit-on-plane": "この部品はモデルの設置基準に接続されています。別の部品に取り付ける前に外してください。",
   "figure.button.fasten-update": "この取り付けを更新",
   "figure.button.align-to-floor": "床に合わせる",
   "figure.button.align-to-ceiling": "天井に合わせる",

package/translations/ko.json

@@ -200,7 +200,7 @@
   "figure.label.shown-always": "늘 보임",
   "figure.label.shown-while": "{control} 값에 따라",
   "figure.label.shown-at-least": "이 값 이상에서 보임",
-  "figure.button.follow-size": "도형 크기를 따라감",
+  "figure.button.follow-size": "모델 크기에 맞추기",
   "figure.text.size-declared-to-follow": "따라갈 도형 크기를 부품에 맞춰 {x} × {y} × {z} mm 로 정했습니다.",
   "figure.label.recipes": "조각",
   "figure.text.recipe-needs-a-part": "붙일 부품을 먼저 고르세요.",
@@ -724,14 +724,15 @@
   "figure.text.placement-intent-wall": "벽 배치: 뒷면을 벽(Z=0)에서 지금 간격 그대로 유지하며 크기를 따라갑니다. 벽 위의 위치(X·Y)는 그대로입니다.",
   "figure.text.placement-intent-center": "중심 배치: 지금 중심 위치를 그대로 두고 크기만 따라갑니다. 바닥·천장·벽에 붙이지 않습니다.",
   "figure.label.resize-intent": "이 부품은 크기가 바뀔 때",
-  "figure.text.resize-intent": "방향마다 지금 치수와 크기 반응이 있습니다. 아래에서 따라갈 방향을 고르고, 붙어 있을 자리와 함께 적용하세요.",
+  "figure.text.resize-intent": "지금은 고정 크기입니다. 모델 크기가 바뀔 때 이 부품도 함께 바꿀지 정할 수 있습니다.",
   "figure.label.resize-diameter": "지름 (X·Z 함께)",
   "figure.label.resize-x": "너비 (X)",
   "figure.label.resize-y": "높이 (Y)",
   "figure.label.resize-z": "깊이 (Z)",
   "figure.label.resize-custom": "다른 규칙에 연결됨",
   "figure.label.resize-following": "도형과 함께 변경",
-  "figure.label.resize-advanced": "다른 부품과 연결 · 세부 설정",
+  "figure.label.resize-advanced": "크기 반응 정하기",
+  "figure.text.resize-all-following": "이 부품의 크기는 모델 크기를 따라 바뀝니다.",
   "figure.text.resize-uniform-warning": "이 도형은 전체 비율 유지 방식입니다. 방향별 변경보다 전체 비율 규칙이 우선합니다. 이 방식의 전환 기능은 아직 제공되지 않습니다.",
   "figure.text.preview-setup": "크기가 기대대로 바뀌지 않나요? 부품을 골라 늘어날 방향과 붙어 있을 자리를 설정하세요. 이 화면의 조작값은 저장된 모델을 바꾸지 않습니다.",
   "figure.label.resize-part": "크기 반응을 설정할 부품",
@@ -829,6 +830,11 @@
   "figure.label.model-settings": "모델 설정",
   "figure.text.fasten-editing": "현재 관계 수정 — {face} → {target}",
   "figure.text.fasten-new": "새로 붙이기",
+  "figure.text.fasten-start": "이 부품을 다른 부품의 면에 붙여 두면, 상대 부품의 크기나 위치가 바뀌어도 함께 움직입니다.",
+  "figure.button.fasten-start": "다른 부품에 붙이기",
+  "figure.label.target-part-placeholder": "붙일 부품 선택",
+  "figure.text.fasten-target-first": "먼저 붙일 부품을 고르세요.",
+  "figure.text.fasten-edit-on-plane": "이 부품은 현재 모델의 설치 기준면에 연결되어 있습니다. 다른 부품에 붙이려면 먼저 붙임을 푸세요.",
   "figure.button.fasten-update": "이 붙임 수정",
   "figure.button.align-to-floor": "바닥에 맞추기",
   "figure.button.align-to-ceiling": "천장에 맞추기",

package/translations/ms.json

@@ -731,7 +731,8 @@
   "figure.label.resize-z": "Kedalaman (Z)",
   "figure.label.resize-custom": "Dipautkan pada peraturan lain",
   "figure.label.resize-following": "Berubah bersama rajah",
-  "figure.label.resize-advanced": "Paut pada bahagian lain · Lanjutan",
+  "figure.label.resize-advanced": "Tetapkan tindak balas saiz",
+  "figure.text.resize-all-following": "Saiz bahagian ini berubah bersama saiz model.",
   "figure.text.resize-uniform-warning": "Rajah ini membesar dengan satu nisbah, yang didahulukan berbanding perubahan setiap arah. Penukaran cara ini belum tersedia.",
   "figure.text.preview-setup": "Saiz tidak berubah seperti dijangka? Pilih bahagian untuk menetapkan arah yang mengikut dan tempat ia dilekatkan. Nilai di sini tidak mengubah model yang disimpan.",
   "figure.label.resize-part": "Bahagian untuk ditetapkan",
@@ -829,6 +830,11 @@
   "figure.label.model-settings": "Tetapan model",
   "figure.text.fasten-editing": "Menyunting lekatan semasa: {face} pada {target}",
   "figure.text.fasten-new": "Lekatkan baharu",
+  "figure.text.fasten-start": "Lekatkan bahagian ini pada muka bahagian lain supaya hubungannya kekal apabila salah satu berubah.",
+  "figure.button.fasten-start": "Lekatkan pada bahagian lain",
+  "figure.label.target-part-placeholder": "Pilih bahagian",
+  "figure.text.fasten-target-first": "Pilih bahagian yang hendak dilekatkan dahulu.",
+  "figure.text.fasten-edit-on-plane": "Bahagian ini disambungkan kepada rujukan peletakan model. Tanggalkan dahulu sebelum melekatkannya pada bahagian lain.",
   "figure.button.fasten-update": "Kemas kini lekatan ini",
   "figure.button.align-to-floor": "Jajarkan ke lantai",
   "figure.button.align-to-ceiling": "Jajarkan ke siling",

package/translations/zh.json

@@ -731,7 +731,8 @@
   "figure.label.resize-z": "深度（Z）",
   "figure.label.resize-custom": "已链接到其他规则",
   "figure.label.resize-following": "随图形一起变化",
-  "figure.label.resize-advanced": "与其他部件链接 · 高级设置",
+  "figure.label.resize-advanced": "设置尺寸响应",
+  "figure.text.resize-all-following": "此部件会随模型尺寸一起变化。",
   "figure.text.resize-uniform-warning": "此图形按单一比例整体缩放，整体比例优先于各方向的变化。暂不提供切换此方式的功能。",
   "figure.text.preview-setup": "尺寸没有按预期变化？请选择部件，设置跟随的方向和附着的位置。此处的操作值不会更改已保存的模型。",
   "figure.label.resize-part": "要设置尺寸跟随的部件",
@@ -829,6 +830,11 @@
   "figure.label.model-settings": "模型设置",
   "figure.text.fasten-editing": "编辑当前附着：{face}附着在{target}上",
   "figure.text.fasten-new": "新建附着",
+  "figure.text.fasten-start": "将此部件附着到另一部件的面上，任一部件变化时都会保持该关系。",
+  "figure.button.fasten-start": "附着到另一部件",
+  "figure.label.target-part-placeholder": "选择部件",
+  "figure.text.fasten-target-first": "请先选择要附着的部件。",
+  "figure.text.fasten-edit-on-plane": "此部件当前连接到模型的安装基准。附着到另一部件前请先解除连接。",
   "figure.button.fasten-update": "更新此附着",
   "figure.button.align-to-floor": "对齐地面",
   "figure.button.align-to-ceiling": "对齐天花板",