@next2d/core 1.17.5 → 1.18.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/Player.d.ts +2 -2
  2. package/dist/Player.js +27 -24
  3. package/package.json +12 -12
package/dist/Player.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { Stage, MovieClip } from "@next2d/display";
1
+ import { Stage, MovieClip, TextField } from "@next2d/display";
2
2
  import { Event as Next2DEvent } from "@next2d/events";
3
3
  import { Video, Sound } from "@next2d/media";
4
4
  import { CanvasToWebGLContext } from "@next2d/webgl";
@@ -22,6 +22,7 @@ export declare class Player {
22
22
  _$scale: number;
23
23
  _$state: "up" | "down";
24
24
  _$attachment: AttachmentImpl | null;
25
+ _$textField: TextField | null;
25
26
  readonly _$videos: Video[];
26
27
  readonly _$sources: Sound[];
27
28
  private _$mode;
@@ -43,7 +44,6 @@ export declare class Player {
43
44
  private _$bgColor;
44
45
  private _$base;
45
46
  private _$fullScreen;
46
- private _$textField;
47
47
  private _$timerId;
48
48
  private _$loadId;
49
49
  private _$deltaX;
package/dist/Player.js CHANGED
@@ -2,7 +2,7 @@ import { Stage } from "@next2d/display";
2
2
  import { Event as Next2DEvent, MouseEvent as Next2DMouseEvent, EventPhase } from "@next2d/events";
3
3
  import { SoundMixer } from "@next2d/media";
4
4
  import { CanvasToWebGLContext } from "@next2d/webgl";
5
- import { $document, $window, $rendererWorker, $PREFIX, $audioContext, $TOUCH_START, $TOUCH_MOVE, $TOUCH_END, $MOUSE_DOWN, $MOUSE_MOVE, $MOUSE_UP, $MOUSE_WHEEL, $DOUBLE_CLICK, $MOUSE_LEAVE, $loadAudioData, $MATRIX_HIT_ARRAY_IDENTITY, $hitContext, $isTouch, $dropTarget, $dragRules, $isSafari, $getEvent, $setEvent, $setEventType, $setCurrentLoaderInfo, $getEventType, $getRenderBufferArray, $getRenderMessageObject, $poolRenderMessageObject } from "@next2d/util";
5
+ import { $document, $window, $rendererWorker, $PREFIX, $audioContext, $TOUCH_START, $TOUCH_MOVE, $TOUCH_END, $MOUSE_DOWN, $MOUSE_MOVE, $MOUSE_UP, $MOUSE_WHEEL, $DOUBLE_CLICK, $MOUSE_LEAVE, $loadAudioData, $MATRIX_HIT_ARRAY_IDENTITY, $hitContext, $isTouch, $dropTarget, $dragRules, $isSafari, $getEvent, $setEvent, $setEventType, $setCurrentLoaderInfo, $getEventType, $getRenderBufferArray, $getRenderMessageObject, $poolRenderMessageObject, $textArea } from "@next2d/util";
6
6
  import { $Math, $performance, $COLOR_ARRAY_IDENTITY, $doUpdated, $isUpdated, $getArray, $getFloat32Array6, $getMap, $uintToRGBA, $toColorInt, $requestAnimationFrame, $cancelAnimationFrame, $poolArray, $clamp, $devicePixelRatio, $setDevicePixelRatio, $cacheStore } from "@next2d/share";
7
7
  /**
8
8
  * 描画のイベントや設定やコントロールの管理クラス
@@ -578,6 +578,7 @@ export class Player {
578
578
  this._$deleteNode();
579
579
  // append canvas
580
580
  element.appendChild(this._$canvas);
581
+ element.appendChild($textArea);
581
582
  // stage init action
582
583
  this._$stage._$prepareActions();
583
584
  // constructed event
@@ -1562,7 +1563,8 @@ export class Player {
1562
1563
  }
1563
1564
  if (this._$clickTarget
1564
1565
  && "_$text" in this._$clickTarget
1565
- && this._$clickTarget.scrollEnabled) {
1566
+ && this._$clickTarget.scrollEnabled
1567
+ && this._$clickTarget.selectIndex === -1) {
1566
1568
  const deltaX = this._$deltaX - pageX;
1567
1569
  const deltaY = this._$deltaY - pageY;
1568
1570
  // @ts-ignore
@@ -1623,22 +1625,16 @@ export class Player {
1623
1625
  break;
1624
1626
  case $TOUCH_START:
1625
1627
  case $MOUSE_DOWN:
1626
- if (this._$stage.hasEventListener(Next2DMouseEvent.MOUSE_DOWN)) {
1627
- this._$stage.dispatchEvent(new Next2DMouseEvent(Next2DMouseEvent.MOUSE_DOWN, true, false));
1628
- }
1629
- // TextField focus out
1630
- if (this._$textField) {
1628
+ if (this._$textField && "focus" in this._$textField) {
1631
1629
  this._$textField.focus = false;
1632
1630
  this._$textField = null;
1633
1631
  }
1632
+ if (this._$stage.hasEventListener(Next2DMouseEvent.MOUSE_DOWN)) {
1633
+ this._$stage.dispatchEvent(new Next2DMouseEvent(Next2DMouseEvent.MOUSE_DOWN, true, false));
1634
+ }
1634
1635
  break;
1635
1636
  case $TOUCH_END:
1636
1637
  case $MOUSE_UP:
1637
- // TextField focus out
1638
- if (this._$textField) {
1639
- this._$textField.focus = false;
1640
- this._$textField = null;
1641
- }
1642
1638
  if (this._$stage.hasEventListener(Next2DMouseEvent.CLICK)) {
1643
1639
  this._$stage.dispatchEvent(new Next2DMouseEvent(Next2DMouseEvent.CLICK, true, false));
1644
1640
  }
@@ -1747,10 +1743,29 @@ export class Player {
1747
1743
  if (this._$state === "up") {
1748
1744
  this._$clickTarget = null;
1749
1745
  }
1746
+ else {
1747
+ if (this._$textField) {
1748
+ this._$textField._$setIndex(stageX, stageY);
1749
+ }
1750
+ }
1750
1751
  break;
1751
1752
  // down event
1752
1753
  case $TOUCH_START:
1753
1754
  case $MOUSE_DOWN:
1755
+ if (this._$textField
1756
+ && instance !== this._$textField) {
1757
+ this._$textField.focus = false;
1758
+ this._$textField = null;
1759
+ }
1760
+ // TextField focus out
1761
+ if ("_$text" in instance) {
1762
+ instance.focus = true;
1763
+ instance._$setIndex(stageX, stageY);
1764
+ this._$textField = instance;
1765
+ // move text area element
1766
+ $textArea.style.left = `${pageX}px`;
1767
+ $textArea.style.top = `${pageY}px`;
1768
+ }
1754
1769
  // (3) mouseDown
1755
1770
  if (instance.willTrigger(Next2DMouseEvent.MOUSE_DOWN)) {
1756
1771
  instance.dispatchEvent(new Next2DMouseEvent(Next2DMouseEvent.MOUSE_DOWN, true, false));
@@ -1761,18 +1776,6 @@ export class Player {
1761
1776
  // up event
1762
1777
  case $TOUCH_END:
1763
1778
  case $MOUSE_UP:
1764
- // TextField focus out
1765
- if (this._$textField
1766
- && instance !== this._$textField
1767
- && "_$text" in this._$textField) {
1768
- this._$textField.focus = false;
1769
- this._$textField = null;
1770
- }
1771
- // TextField focus out
1772
- if ("_$text" in instance) {
1773
- instance.focus = true;
1774
- this._$textField = instance;
1775
- }
1776
1779
  // (1) mouseUp
1777
1780
  if (instance.willTrigger(Next2DMouseEvent.MOUSE_UP)) {
1778
1781
  instance.dispatchEvent(new Next2DMouseEvent(Next2DMouseEvent.MOUSE_UP, true, false));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@next2d/core",
3
- "version": "1.17.5",
3
+ "version": "1.18.1",
4
4
  "description": "Next2D Core Packages",
5
5
  "author": "Toshiyuki Ienaga<ienaga@tvon.jp> (https://github.com/ienaga/)",
6
6
  "license": "MIT",
@@ -32,16 +32,16 @@
32
32
  "url": "git+https://github.com/Next2D/Player.git"
33
33
  },
34
34
  "peerDependencies": {
35
- "@next2d/interface": "1.17.5",
36
- "@next2d/webgl": "1.17.5",
37
- "@next2d/display": "1.17.5",
38
- "@next2d/core": "1.17.5",
39
- "@next2d/net": "1.17.5",
40
- "@next2d/share": "1.17.5",
41
- "@next2d/events": "1.17.5",
42
- "@next2d/media": "1.17.5",
43
- "@next2d/text": "1.17.5",
44
- "@next2d/geom": "1.17.5",
45
- "@next2d/util": "1.17.5"
35
+ "@next2d/interface": "1.18.1",
36
+ "@next2d/webgl": "1.18.1",
37
+ "@next2d/display": "1.18.1",
38
+ "@next2d/core": "1.18.1",
39
+ "@next2d/net": "1.18.1",
40
+ "@next2d/share": "1.18.1",
41
+ "@next2d/events": "1.18.1",
42
+ "@next2d/media": "1.18.1",
43
+ "@next2d/text": "1.18.1",
44
+ "@next2d/geom": "1.18.1",
45
+ "@next2d/util": "1.18.1"
46
46
  }
47
47
  }