瀏覽代碼

rename start -> begin

main
Steve Ruiz 4 年之前
父節點
當前提交
22a97d1374
共有 2 個檔案被更改,包括 15 行新增22 行删除
  1. 2
    6
      state/session.ts
  2. 13
    16
      state/state.ts

+ 2
- 6
state/session.ts 查看文件

18
     return this
18
     return this
19
   }
19
   }
20
 
20
 
21
-  start(session: BaseSession) {
21
+  begin(session: BaseSession) {
22
     this._current = session
22
     this._current = session
23
     return this
23
     return this
24
   }
24
   }
25
 
25
 
26
-  compplete<T extends BaseSession>(...args: Parameters<T['complete']>) {
26
+  complete<T extends BaseSession>(...args: Parameters<T['complete']>) {
27
     this._current.complete.call(null, ...args)
27
     this._current.complete.call(null, ...args)
28
     return this
28
     return this
29
   }
29
   }
32
     this._current.cancel.call(null, ...args)
32
     this._current.cancel.call(null, ...args)
33
     return this
33
     return this
34
   }
34
   }
35
-
36
-  get current() {
37
-    return this._current
38
-  }
39
 }
35
 }
40
 
36
 
41
 const session = new SessionManager()
37
 const session = new SessionManager()

+ 13
- 16
state/state.ts 查看文件

986
 
986
 
987
     // Shared
987
     // Shared
988
     breakSession(data) {
988
     breakSession(data) {
989
-      session.current?.cancel(data)
990
-      session.clear()
989
+      session.cancel(data).clear()
991
       history.disable()
990
       history.disable()
992
       commands.deleteSelected(data)
991
       commands.deleteSelected(data)
993
       history.enable()
992
       history.enable()
994
     },
993
     },
995
     cancelSession(data) {
994
     cancelSession(data) {
996
-      session.current?.cancel(data)
997
-      session.clear()
995
+      session.cancel(data).clear()
998
     },
996
     },
999
     completeSession(data) {
997
     completeSession(data) {
1000
-      session.current?.complete(data)
1001
-      session.clear()
998
+      session.complete(data).clear()
1002
     },
999
     },
1003
 
1000
 
1004
     // Editing
1001
     // Editing
1005
     startEditSession(data) {
1002
     startEditSession(data) {
1006
-      session.start(new Sessions.EditSession(data))
1003
+      session.begin(new Sessions.EditSession(data))
1007
     },
1004
     },
1008
     updateEditSession(data, payload: { change: Partial<Shape> }) {
1005
     updateEditSession(data, payload: { change: Partial<Shape> }) {
1009
       session.update<Sessions.EditSession>(data, payload.change)
1006
       session.update<Sessions.EditSession>(data, payload.change)
1011
 
1008
 
1012
     // Brushing
1009
     // Brushing
1013
     startBrushSession(data, payload: PointerInfo) {
1010
     startBrushSession(data, payload: PointerInfo) {
1014
-      session.start(
1011
+      session.begin(
1015
         new Sessions.BrushSession(data, screenToWorld(payload.point, data))
1012
         new Sessions.BrushSession(data, screenToWorld(payload.point, data))
1016
       )
1013
       )
1017
     },
1014
     },
1024
 
1021
 
1025
     // Rotating
1022
     // Rotating
1026
     startRotateSession(data, payload: PointerInfo) {
1023
     startRotateSession(data, payload: PointerInfo) {
1027
-      session.start(
1024
+      session.begin(
1028
         new Sessions.RotateSession(data, screenToWorld(payload.point, data))
1025
         new Sessions.RotateSession(data, screenToWorld(payload.point, data))
1029
       )
1026
       )
1030
     },
1027
     },
1045
 
1042
 
1046
     // Dragging / Translating
1043
     // Dragging / Translating
1047
     startTranslateSession(data) {
1044
     startTranslateSession(data) {
1048
-      session.start(
1045
+      session.begin(
1049
         new Sessions.TranslateSession(
1046
         new Sessions.TranslateSession(
1050
           data,
1047
           data,
1051
           screenToWorld(inputs.pointer.origin, data)
1048
           screenToWorld(inputs.pointer.origin, data)
1083
       const shapeId = Array.from(getSelectedIds(data).values())[0]
1080
       const shapeId = Array.from(getSelectedIds(data).values())[0]
1084
       const handleId = payload.target
1081
       const handleId = payload.target
1085
 
1082
 
1086
-      session.start(
1083
+      session.begin(
1087
         new Sessions.HandleSession(
1084
         new Sessions.HandleSession(
1088
           data,
1085
           data,
1089
           shapeId,
1086
           shapeId,
1116
       payload: PointerInfo & { target: Corner | Edge }
1113
       payload: PointerInfo & { target: Corner | Edge }
1117
     ) {
1114
     ) {
1118
       const point = screenToWorld(inputs.pointer.origin, data)
1115
       const point = screenToWorld(inputs.pointer.origin, data)
1119
-      session.start(
1116
+      session.begin(
1120
         getSelectedIds(data).size === 1
1117
         getSelectedIds(data).size === 1
1121
           ? new Sessions.TransformSingleSession(data, payload.target, point)
1118
           ? new Sessions.TransformSingleSession(data, payload.target, point)
1122
           : new Sessions.TransformSession(data, payload.target, point)
1119
           : new Sessions.TransformSession(data, payload.target, point)
1123
       )
1120
       )
1124
     },
1121
     },
1125
     startDrawTransformSession(data, payload: PointerInfo) {
1122
     startDrawTransformSession(data, payload: PointerInfo) {
1126
-      session.start(
1123
+      session.begin(
1127
         new Sessions.TransformSingleSession(
1124
         new Sessions.TransformSingleSession(
1128
           data,
1125
           data,
1129
           Corner.BottomRight,
1126
           Corner.BottomRight,
1149
 
1146
 
1150
     // Direction
1147
     // Direction
1151
     startDirectionSession(data) {
1148
     startDirectionSession(data) {
1152
-      session.start(
1149
+      session.begin(
1153
         new Sessions.DirectionSession(
1150
         new Sessions.DirectionSession(
1154
           data,
1151
           data,
1155
           screenToWorld(inputs.pointer.origin, data)
1152
           screenToWorld(inputs.pointer.origin, data)
1166
     // Drawing
1163
     // Drawing
1167
     startDrawSession(data, payload: PointerInfo) {
1164
     startDrawSession(data, payload: PointerInfo) {
1168
       const id = Array.from(getSelectedIds(data).values())[0]
1165
       const id = Array.from(getSelectedIds(data).values())[0]
1169
-      session.start(
1166
+      session.begin(
1170
         new Sessions.DrawSession(
1167
         new Sessions.DrawSession(
1171
           data,
1168
           data,
1172
           id,
1169
           id,
1196
     startArrowSession(data, payload: PointerInfo) {
1193
     startArrowSession(data, payload: PointerInfo) {
1197
       const id = Array.from(getSelectedIds(data).values())[0]
1194
       const id = Array.from(getSelectedIds(data).values())[0]
1198
 
1195
 
1199
-      session.start(
1196
+      session.begin(
1200
         new Sessions.ArrowSession(
1197
         new Sessions.ArrowSession(
1201
           data,
1198
           data,
1202
           id,
1199
           id,

Loading…
取消
儲存