copy_tuner_client 1.4.0 → 2.0.0

data/src/copytuner_bar.ts

@@ -5,7 +5,7 @@ const HIDDEN_CLASS = 'copy-tuner-hidden'
 
 export default class CopytunerBar {
   // @ts-expect-error TS7006
-  constructor(element, data, callback) {
+  constructor(element, data, callback, keysSkipped = false) {
     // @ts-expect-error TS2339
     this.element = element
     // @ts-expect-error TS2339
@@ -19,9 +19,23 @@ export default class CopytunerBar {
     // @ts-expect-error TS2339
     this.element.append(this.logMenuElement)
 
+    // 巨大DOM/Nokogiri例外でキー付与がスキップされた場合は、オーバーレイが使えないので
+    // ツールバー（Translations in this page）から編集する旨を案内する。
+    if (keysSkipped) {
+      this.appendSkippedNotice()
+    }
+
     this.addHandler()
   }
 
+  appendSkippedNotice() {
+    const notice = document.createElement('span')
+    notice.classList.add('copy-tuner-bar__notice')
+    notice.textContent = '⚠ This page is too large for the overlay. Use "Translations in this page" to edit.'
+    // @ts-expect-error TS2339
+    this.element.append(notice)
+  }
+
   addHandler() {
     // @ts-expect-error TS2339
     const openLogButton = this.element.querySelector('.js-copy-tuner-bar-open-log')

data/src/main.ts

@@ -9,6 +9,9 @@ declare global {
       toggle?: () => void
       // TODO: type
       data: object
+      // 巨大DOM/Nokogiri例外で data-copyray-key 付与をスキップしたか。
+      // true のときオーバーレイは使えないのでツールバーから編集する旨を案内する。
+      keysSkipped?: boolean
     }
   }
 }
@@ -30,10 +33,10 @@ const appendCopyTunerBar = (url: string) => {
 }
 
 const start = () => {
-  const { url, data } = window.CopyTuner
+  const { url, data, keysSkipped } = window.CopyTuner
 
   appendCopyTunerBar(url)
-  const copyray = new Copyray(url, data)
+  const copyray = new Copyray(url, data, Boolean(keysSkipped))
   window.CopyTuner.toggle = () => copyray.toggle()
 
   document.addEventListener('keydown', (event) => {

data/src/specimen.ts

@@ -4,11 +4,11 @@ const ZINDEX = 2_000_000_000
 
 export default class Specimen {
   // @ts-expect-error TS7006
-  constructor(element, key, callback) {
+  constructor(element, keys, callback) {
     // @ts-expect-error TS2339
     this.element = element
     // @ts-expect-error TS2339
-    this.key = key
+    this.keys = keys
     // @ts-expect-error TS2339
     this.callback = callback
   }
@@ -19,10 +19,11 @@ export default class Specimen {
     // @ts-expect-error TS2339
     if (this.box === null) return
 
+    // box 全体のクリックは先頭キーを開く（広いクリック領域を維持）。複数キー時は各ラベルから個別に開ける
     // @ts-expect-error TS2339
     this.box.addEventListener('click', () => {
       // @ts-expect-error TS2339
-      this.callback(this.key)
+      this.callback(this.keys[0])
     })
 
     // @ts-expect-error TS2339
@@ -69,16 +70,25 @@ export default class Specimen {
       this.box.style.left = `${left}px`
     }
 
-    box.append(this.makeLabel())
+    // @ts-expect-error TS2339
+    for (const key of this.keys) {
+      box.append(this.makeLabel(key))
+    }
     return box
   }
 
-  makeLabel() {
+  // @ts-expect-error TS7006
+  makeLabel(key) {
     const div = document.createElement('div')
     div.classList.add('copyray-specimen-handle')
     div.classList.add('Specimen')
-    // @ts-expect-error TS2339
-    div.textContent = this.key
+    div.textContent = key
+    // ラベルのクリックはそのキーを開く。box への伝播を止めて先頭キーとの二重発火を防ぐ
+    div.addEventListener('click', (event) => {
+      event.stopPropagation()
+      // @ts-expect-error TS2339
+      this.callback(key)
+    })
     return div
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - SonicGarden
@@ -198,6 +198,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- UPGRADING.md
 - app/assets/javascripts/copytuner.js
 - app/assets/stylesheets/copytuner.css
 - copy_tuner_client.gemspec
@@ -210,6 +211,8 @@ files:
 - lib/copy_tuner_client/client.rb
 - lib/copy_tuner_client/configuration.rb
 - lib/copy_tuner_client/copyray.rb
+- lib/copy_tuner_client/copyray/marker.rb
+- lib/copy_tuner_client/copyray/rewriter.rb
 - lib/copy_tuner_client/copyray_middleware.rb
 - lib/copy_tuner_client/dotted_hash.rb
 - lib/copy_tuner_client/engine.rb
@@ -237,10 +240,15 @@ files:
 - skills/copy-tuner-to-locales-migrate-prefix/references/local-first-regexp.md
 - skills/copy-tuner-to-locales-migrate-prefix/references/verification-per-prefix.md
 - skills/copy-tuner-to-locales-migrate-prefix/scripts/migrate_prefix.rb
+- skills/copy-tuner-to-t-migrate/SKILL.md
+- skills/copy-tuner-to-t-migrate/scripts/migrate_tt.rb
 - skills/copy-tuner/SKILL.md
 - spec/copy_tuner_client/cache_spec.rb
 - spec/copy_tuner_client/client_spec.rb
 - spec/copy_tuner_client/configuration_spec.rb
+- spec/copy_tuner_client/copyray/marker_spec.rb
+- spec/copy_tuner_client/copyray/rewriter_spec.rb
+- spec/copy_tuner_client/copyray_middleware_spec.rb
 - spec/copy_tuner_client/copyray_spec.rb
 - spec/copy_tuner_client/dotted_hash_spec.rb
 - spec/copy_tuner_client/helper_extension_spec.rb