浏览代码

Adds session completes when leaving a creation/editing state

main
Steve Ruiz 4 年前
父节点
当前提交
66ec007e4f
共有 1 个文件被更改,包括 19 次插入13 次删除
  1. 19
    13
      state/state.ts

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

151
           do: 'deleteSelection',
151
           do: 'deleteSelection',
152
           else: ['selectAll', 'deleteSelection'],
152
           else: ['selectAll', 'deleteSelection'],
153
         },
153
         },
154
+        SELECTED_ALL: { to: 'selecting', do: 'selectAll' },
154
         CHANGED_PAGE: 'changePage',
155
         CHANGED_PAGE: 'changePage',
155
         CREATED_PAGE: ['clearSelectedIds', 'createPage'],
156
         CREATED_PAGE: ['clearSelectedIds', 'createPage'],
156
         DELETED_PAGE: { unless: 'hasOnlyOnePage', do: 'deletePage' },
157
         DELETED_PAGE: { unless: 'hasOnlyOnePage', do: 'deletePage' },
204
               if: ['hasSelection', 'selectionIncludesGroups'],
205
               if: ['hasSelection', 'selectionIncludesGroups'],
205
               do: 'ungroupSelection',
206
               do: 'ungroupSelection',
206
             },
207
             },
207
-            SELECTED_ALL: { to: 'selecting', do: 'selectAll' },
208
             NUDGED: { do: 'nudgeSelection' },
208
             NUDGED: { do: 'nudgeSelection' },
209
             ZOOMED_CAMERA: {
209
             ZOOMED_CAMERA: {
210
               do: 'zoomCamera',
210
               do: 'zoomCamera',
361
             },
361
             },
362
             rotatingSelection: {
362
             rotatingSelection: {
363
               onEnter: 'startRotateSession',
363
               onEnter: 'startRotateSession',
364
-              onExit: 'clearBoundsRotation',
364
+              onExit: ['completeSession', 'clearBoundsRotation'],
365
               on: {
365
               on: {
366
                 MOVED_POINTER: 'updateRotateSession',
366
                 MOVED_POINTER: 'updateRotateSession',
367
                 PANNED_CAMERA: 'updateRotateSession',
367
                 PANNED_CAMERA: 'updateRotateSession',
368
                 PRESSED_SHIFT_KEY: 'keyUpdateRotateSession',
368
                 PRESSED_SHIFT_KEY: 'keyUpdateRotateSession',
369
                 RELEASED_SHIFT_KEY: 'keyUpdateRotateSession',
369
                 RELEASED_SHIFT_KEY: 'keyUpdateRotateSession',
370
-                STOPPED_POINTING: { do: 'completeSession', to: 'selecting' },
370
+                STOPPED_POINTING: { to: 'selecting' },
371
                 CANCELLED: { do: 'cancelSession', to: 'selecting' },
371
                 CANCELLED: { do: 'cancelSession', to: 'selecting' },
372
               },
372
               },
373
             },
373
             },
374
             transformingSelection: {
374
             transformingSelection: {
375
               onEnter: 'startTransformSession',
375
               onEnter: 'startTransformSession',
376
+              onExit: 'completeSession',
376
               on: {
377
               on: {
377
                 // MOVED_POINTER: 'updateTransformSession', using hacks.fastTransform
378
                 // MOVED_POINTER: 'updateTransformSession', using hacks.fastTransform
378
                 PANNED_CAMERA: 'updateTransformSession',
379
                 PANNED_CAMERA: 'updateTransformSession',
379
                 PRESSED_SHIFT_KEY: 'keyUpdateTransformSession',
380
                 PRESSED_SHIFT_KEY: 'keyUpdateTransformSession',
380
                 RELEASED_SHIFT_KEY: 'keyUpdateTransformSession',
381
                 RELEASED_SHIFT_KEY: 'keyUpdateTransformSession',
381
-                STOPPED_POINTING: { do: 'completeSession', to: 'selecting' },
382
+                STOPPED_POINTING: { to: 'selecting' },
382
                 CANCELLED: { do: 'cancelSession', to: 'selecting' },
383
                 CANCELLED: { do: 'cancelSession', to: 'selecting' },
383
               },
384
               },
384
             },
385
             },
385
             translatingSelection: {
386
             translatingSelection: {
386
               onEnter: 'startTranslateSession',
387
               onEnter: 'startTranslateSession',
388
+              onExit: 'completeSession',
387
               on: {
389
               on: {
388
                 MOVED_POINTER: 'updateTranslateSession',
390
                 MOVED_POINTER: 'updateTranslateSession',
389
                 PANNED_CAMERA: 'updateTranslateSession',
391
                 PANNED_CAMERA: 'updateTranslateSession',
391
                 RELEASED_SHIFT_KEY: 'keyUpdateTranslateSession',
393
                 RELEASED_SHIFT_KEY: 'keyUpdateTranslateSession',
392
                 PRESSED_ALT_KEY: 'keyUpdateTranslateSession',
394
                 PRESSED_ALT_KEY: 'keyUpdateTranslateSession',
393
                 RELEASED_ALT_KEY: 'keyUpdateTranslateSession',
395
                 RELEASED_ALT_KEY: 'keyUpdateTranslateSession',
394
-                STOPPED_POINTING: { do: 'completeSession', to: 'selecting' },
396
+                STOPPED_POINTING: { to: 'selecting' },
395
                 CANCELLED: { do: 'cancelSession', to: 'selecting' },
397
                 CANCELLED: { do: 'cancelSession', to: 'selecting' },
396
               },
398
               },
397
             },
399
             },
398
             translatingHandles: {
400
             translatingHandles: {
399
               onEnter: 'startHandleSession',
401
               onEnter: 'startHandleSession',
402
+              onExit: 'completeSession',
400
               on: {
403
               on: {
401
                 MOVED_POINTER: 'updateHandleSession',
404
                 MOVED_POINTER: 'updateHandleSession',
402
                 PANNED_CAMERA: 'updateHandleSession',
405
                 PANNED_CAMERA: 'updateHandleSession',
403
                 PRESSED_SHIFT_KEY: 'keyUpdateHandleSession',
406
                 PRESSED_SHIFT_KEY: 'keyUpdateHandleSession',
404
                 RELEASED_SHIFT_KEY: 'keyUpdateHandleSession',
407
                 RELEASED_SHIFT_KEY: 'keyUpdateHandleSession',
405
-                STOPPED_POINTING: { do: 'completeSession', to: 'selecting' },
408
+                STOPPED_POINTING: { to: 'selecting' },
406
                 CANCELLED: { do: 'cancelSession', to: 'selecting' },
409
                 CANCELLED: { do: 'cancelSession', to: 'selecting' },
407
               },
410
               },
408
             },
411
             },
409
             brushSelecting: {
412
             brushSelecting: {
413
+              onExit: 'completeSession',
410
               onEnter: [
414
               onEnter: [
411
                 {
415
                 {
412
                   unless: ['isPressingMetaKey', 'isPressingShiftKey'],
416
                   unless: ['isPressingMetaKey', 'isPressingShiftKey'],
416
                 'startBrushSession',
420
                 'startBrushSession',
417
               ],
421
               ],
418
               on: {
422
               on: {
419
-                STARTED_PINCHING: { do: 'completeSession', to: 'pinching' },
420
                 // MOVED_POINTER: 'updateBrushSession', using hacks.fastBrushSelect
423
                 // MOVED_POINTER: 'updateBrushSession', using hacks.fastBrushSelect
421
                 PANNED_CAMERA: 'updateBrushSession',
424
                 PANNED_CAMERA: 'updateBrushSession',
422
-                STOPPED_POINTING: { do: 'completeSession', to: 'selecting' },
425
+                STOPPED_POINTING: { to: 'selecting' },
423
                 CANCELLED: { do: 'cancelSession', to: 'selecting' },
426
                 CANCELLED: { do: 'cancelSession', to: 'selecting' },
424
               },
427
               },
425
             },
428
             },
427
         },
430
         },
428
         editingShape: {
431
         editingShape: {
429
           onEnter: 'startEditSession',
432
           onEnter: 'startEditSession',
430
-          onExit: 'clearEditingId',
433
+          onExit: ['completeSession', 'clearEditingId'],
431
           on: {
434
           on: {
432
             EDITED_SHAPE: { do: 'updateEditSession' },
435
             EDITED_SHAPE: { do: 'updateEditSession' },
433
 
436
 
434
-            BLURRED_EDITING_SHAPE: { do: 'completeSession', to: 'selecting' },
437
+            BLURRED_EDITING_SHAPE: { to: 'selecting' },
435
             CANCELLED: [
438
             CANCELLED: [
436
               {
439
               {
437
                 get: 'editingShape',
440
                 get: 'editingShape',
529
                 },
532
                 },
530
                 editing: {
533
                 editing: {
531
                   onEnter: 'startDrawSession',
534
                   onEnter: 'startDrawSession',
535
+                  onExit: 'completeSession',
532
                   on: {
536
                   on: {
533
                     CANCELLED: {
537
                     CANCELLED: {
534
                       do: 'breakSession',
538
                       do: 'breakSession',
572
                       {
576
                       {
573
                         if: 'isToolLocked',
577
                         if: 'isToolLocked',
574
                         to: 'dot.creating',
578
                         to: 'dot.creating',
575
-                        else: {
576
-                          to: 'selecting',
577
-                        },
579
+                        else: { to: 'selecting' },
578
                       },
580
                       },
579
                     ],
581
                     ],
580
                     CANCELLED: {
582
                     CANCELLED: {
593
                       },
595
                       },
594
                     },
596
                     },
595
                     active: {
597
                     active: {
598
+                      onExit: 'completeSession',
596
                       onEnter: 'startTranslateSession',
599
                       onEnter: 'startTranslateSession',
597
                       on: {
600
                       on: {
598
                         MOVED_POINTER: 'updateTranslateSession',
601
                         MOVED_POINTER: 'updateTranslateSession',
625
                   },
628
                   },
626
                 },
629
                 },
627
                 editing: {
630
                 editing: {
631
+                  onExit: 'completeSession',
628
                   onEnter: 'startArrowSession',
632
                   onEnter: 'startArrowSession',
629
                   on: {
633
                   on: {
630
                     STOPPED_POINTING: [
634
                     STOPPED_POINTING: [
837
           },
841
           },
838
         },
842
         },
839
         drawingShape: {
843
         drawingShape: {
844
+          onExit: 'completeSession',
840
           on: {
845
           on: {
841
             STOPPED_POINTING: [
846
             STOPPED_POINTING: [
842
               'completeSession',
847
               'completeSession',
862
             },
867
             },
863
             direction: {
868
             direction: {
864
               onEnter: 'startDirectionSession',
869
               onEnter: 'startDirectionSession',
870
+              onExit: 'completeSession',
865
               on: {
871
               on: {
866
                 MOVED_POINTER: 'updateDirectionSession',
872
                 MOVED_POINTER: 'updateDirectionSession',
867
                 PANNED_CAMERA: 'updateDirectionSession',
873
                 PANNED_CAMERA: 'updateDirectionSession',

正在加载...
取消
保存