Pārlūkot izejas kodu

Adds session completes when leaving a creation/editing state

main
Steve Ruiz 4 gadus atpakaļ
vecāks
revīzija
66ec007e4f
1 mainītis faili ar 19 papildinājumiem un 13 dzēšanām
  1. 19
    13
      state/state.ts

+ 19
- 13
state/state.ts Parādīt failu

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

Notiek ielāde…
Atcelt
Saglabāt