From 9a1e67af3e7d078d4629d43997d4248d2c4cf7a1 Mon Sep 17 00:00:00 2001
From: Richard Shane <5288729+rickshane@users.noreply.github.com>
Date: Mon, 25 Mar 2024 01:59:20 +1100
Subject: [PATCH] feat: Undo/Redo Feature for Mantis (#379)

* Undo/Redo Feature for Mantis

* Addressing comments in PR

* Add MantisExampleTests target back to project - somehow got deleted.

* Adressing Comments in Chante List:
- added "enableUndo" flag in Config
- undo/redo/reset logic checks the "enableUndo" flag in cropViewController to enable functionality
- abstracted the TransformRecord logic into the CropViewController class
- removed UIButtons from TransformDelegate
- moved TransformDelegate in to new file in the Protocols folder

* added logic to validate the Catalyst menus (disable undo menus when "enableUndo" is false in Config file.

* Address latest round of comments
- More private variables.
- Embedded controller uses proxy functions to communicate with CropViewController state.
- Defaults function implementations in delegate methods.

* Rename some delegate methods:
cropViewControllerDidEnableUndo -> cropViewControllerDidUpdateEnableStateForUndo
cropViewControllerDidEnableRedo -> cropViewControllerDidUpdateEnableStateForRedo
cropViewControllerDidEnableReset -> cropViewControllerDidUpdateEnableStateForReset

* TransformStack private now

* changed actionString declaration.

* removed unwanted space

* Removed some old code, that was not needed anymore when the function signature changed.

* removed  func cropViewControllerDidImageTransformed(_ cropViewController: CropViewController) from CropViewControllerDelegate

* Remove spaces

* removed public from some data types:
TransformType
TransformRecord
TransformStack

* TransformDelegate methods no longer public

* moved opening brackets up to end of function declarations

* removed public modifier in all variables and function signatures in TransformRecord

* removed public modifier from all variables and function signatures in TransformStack

* Placeholder localization strings for "Change Crop" and "Reset Changes"

* Localized "Change Crop" and "Reset Changes" using Google Translate.

* updated the README.md file to describe Undo/Redo support.

* Changed Chinese language localization strings

* Refactoring work:
- rename TransformDelegate methods
- make TransformStack init a private method

* - Fixed a localization bug
- Removed a dead deprecation directive

* cleaned up property list for TransformRecord

* made dictionary passed to TransformRecord have strong type in value field

* changed transformDelegate to an optional

* made private some variables in TransformStack

* Add new files to Mantis.xcodeproj:
- TransformStack.swift
- TransformRecord.swift
- TransformDelegate.swift

* remove dead code

* Rename delegate methods in CropViewControllerDelegate:
- cropViewControllerDidUpdateEnableStateForUndo(_ enable: Bool) -> cropViewController(_ cropViewController: CropViewController, didUpdateEnableStateForUndo enable: Bool)

- cropViewControllerDidUpdateEnableStateForRedo(_ enable: Bool) -> cropViewController(_ cropViewController: CropViewController, didUpdateEnableStateForRedo enable: Bool)

- cropViewControllerDidUpdateEnableStateForReset(_ enable: Bool) -> cropViewController(_ cropViewController: CropViewController, didUpdateEnableStateForReset enable: Bool)

* Remove blanl line

* Simplify an optional value boolean test

* Remove three unused variables from TransformStack

* Address a SwiftLint warning in TransformRecord

* Address a SwiftLint warning in TransformRecord

* Fixed Unit Tests in Mantis.xcodeproj related to new API for undo/redo feature.

* remove first call to transform() in applyCropState() and just set the viewModel's cropBoxFrame to the transform.maskFrame

* moved function "pushTransformRecordOntoStack" out of CropViewController and in to TransformStack class

* added bounds check in TransformStack.popTransformStack()

* added Unit Test for TransformStack

* Updated TransformStack Unit Test.
---
 Example/AppDelegate.swift                     |  37 ++
 Example/Base.lproj/Main.storyboard            |  29 +-
 Example/EmbeddedCropViewController.swift      | 100 ++++-
 .../MantisExample.xcodeproj/project.pbxproj   |  38 +-
 .../xcschemes/MantisExample.xcscheme          |   1 +
 Example/ViewController.swift                  |   5 +-
 Example/zh-Hans.lproj/Main.storyboard         |  57 +--
 Mantis.xcodeproj/project.pbxproj              |  28 ++
 README.md                                     |  11 +
 Sources/Mantis/Config.swift                   |   2 +
 Sources/Mantis/CropData.swift                 |  73 +++-
 .../Mantis/CropView/CropView+Touches.swift    |   5 +-
 .../CropView+UIScrollViewDelegate.swift       |   1 +
 Sources/Mantis/CropView/CropView.swift        |  40 ++
 .../CropViewController.swift                  | 349 +++++++++++++-----
 Sources/Mantis/Helpers/Orientation.swift      |   2 +-
 Sources/Mantis/Helpers/TransformRecord.swift  |  88 +++++
 Sources/Mantis/Helpers/TransformStack.swift   |  73 ++++
 Sources/Mantis/Mantis.swift                   |   2 +
 .../Protocols/CropToolbarProtocol.swift       |   5 +
 .../CropViewControllerDelegate.swift          |  15 +-
 .../Mantis/Protocols/CropViewProtocol.swift   |   3 +-
 .../Mantis/Protocols/TransformDelegate.swift  |  21 ++
 .../ar.lproj/MantisLocalizable.strings        |   2 +
 .../de.lproj/MantisLocalizable.strings        |   3 +-
 .../en.lproj/MantisLocalizable.strings        |   3 +-
 .../es.lproj/MantisLocalizable.strings        |   2 +
 .../fr.lproj/MantisLocalizable.strings        |   3 +-
 .../it.lproj/MantisLocalizable.strings        |   3 +-
 .../ja.lproj/MantisLocalizable.strings        |   3 +-
 .../ko-KR.lproj/MantisLocalizable.strings     |   2 +
 .../ko.lproj/MantisLocalizable.strings        |   3 +-
 .../nl.lproj/MantisLocalizable.strings        |   3 +-
 .../pt-PT.lproj/MantisLocalizable.strings     |   3 +-
 .../ru.lproj/MantisLocalizable.strings        |   2 +
 .../tr.lproj/MantisLocalizable.strings        |   3 +-
 .../zh-Hans.lproj/MantisLocalizable.strings   |   2 +
 .../zh-Hant.lproj/MantisLocalizable.strings   |   2 +
 .../RotationDial/RotationDial.swift           |   3 +
 Tests/MantisTests/Mock/FakeCropView.swift     |  25 +-
 .../Mock/FakeCropViewControllerDelegate.swift |   2 +-
 Tests/MantisTests/TransformStackTests.swift   |  82 ++++
 42 files changed, 957 insertions(+), 179 deletions(-)
 create mode 100644 Sources/Mantis/Helpers/TransformRecord.swift
 create mode 100644 Sources/Mantis/Helpers/TransformStack.swift
 create mode 100644 Sources/Mantis/Protocols/TransformDelegate.swift
 create mode 100644 Tests/MantisTests/TransformStackTests.swift

diff --git a/Example/AppDelegate.swift b/Example/AppDelegate.swift
index bce2b362..d326818b 100644
--- a/Example/AppDelegate.swift
+++ b/Example/AppDelegate.swift
@@ -40,3 +40,40 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
   }
 }
+
+extension AppDelegate {
+    
+    override func buildMenu(with builder: UIMenuBuilder) {
+        super.buildMenu(with: builder)
+        
+        // Ensure that the builder is modifying the menu bar system.
+        guard builder.system == UIMenuSystem.main else { return }
+        
+        // remove items from Edit menu
+        builder.remove(menu: .undoRedo)
+        
+        // Undo
+        let undoCommand = UIKeyCommand(title: "Undo",
+                                       action: #selector(EmbeddedCropViewController.undoButtonPressed(_:)),
+                                       input: "z",
+                                       modifierFlags: [.command])
+        
+        
+        // Redo
+        let redoCommand = UIKeyCommand(title: "Redo",
+                                       action: #selector(EmbeddedCropViewController.redoButtonPressed(_:)),
+                                       input: "z",
+                                       modifierFlags: [.shift, .command])
+        
+        // Revert
+        let revertCommand = UIKeyCommand(title: "Revert to Original",
+                                       action: #selector(EmbeddedCropViewController.resetButtonPressed(_:)),
+                                       input: "r",
+                                         modifierFlags: [.alternate])
+        
+        let undoMenu = UIMenu(title: "", identifier: .undoRedo, options: .displayInline, children: [undoCommand, redoCommand, revertCommand ])
+        
+        builder.insertChild(undoMenu, atStartOfMenu: .edit)
+        
+    }
+}
diff --git a/Example/Base.lproj/Main.storyboard b/Example/Base.lproj/Main.storyboard
index 54cd9d8c..1070a72a 100644
--- a/Example/Base.lproj/Main.storyboard
+++ b/Example/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -174,7 +174,7 @@
                                 </constraints>
                             </stackView>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sunflower" translatesAutoresizingMaskIntoConstraints="NO" id="pUS-Eo-0ui" userLabel="Cropped Image">
-                                <rect key="frame" x="32" y="16" width="311" height="342"/>
+                                <rect key="frame" x="32" y="36" width="311" height="322"/>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
@@ -247,6 +247,23 @@
                                 <action selector="cancel:" destination="aIe-ND-Zfg" id="j3e-ai-8lv"/>
                             </connections>
                         </barButtonItem>
+                        <barButtonItem title="Undo" id="HSP-G5-UOE">
+                            <color key="tintColor" systemColor="systemYellowColor"/>
+                            <connections>
+                                <action selector="undoButtonPressed:" destination="aIe-ND-Zfg" id="8eI-4B-Rt7"/>
+                            </connections>
+                        </barButtonItem>
+                        <barButtonItem title="Redo" id="l1v-fT-hP5">
+                            <color key="tintColor" systemColor="systemYellowColor"/>
+                            <connections>
+                                <action selector="redoButtonPressed:" destination="aIe-ND-Zfg" id="pck-70-va2"/>
+                            </connections>
+                        </barButtonItem>
+                        <barButtonItem title="Reset" id="eee-mM-zNC">
+                            <connections>
+                                <action selector="resetButtonPressed:" destination="aIe-ND-Zfg" id="S6Q-y0-GYz"/>
+                            </connections>
+                        </barButtonItem>
                         <barButtonItem style="plain" systemItem="flexibleSpace" id="DsY-rM-AWO"/>
                         <barButtonItem systemItem="bookmarks" id="sQZ-M0-ZLt">
                             <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -270,7 +287,10 @@
                     <connections>
                         <outlet property="cancelButton" destination="5p4-Ob-R9b" id="kQq-ir-MSf"/>
                         <outlet property="doneButton" destination="kZP-3N-vXv" id="RPY-W3-vWu"/>
+                        <outlet property="redoButton" destination="l1v-fT-hP5" id="jYe-4F-ear"/>
+                        <outlet property="resetButton" destination="eee-mM-zNC" id="Jfu-qz-XAZ"/>
                         <outlet property="resolutionLabel" destination="NDR-Th-Zyy" id="rUQ-h6-q2i"/>
+                        <outlet property="undoButton" destination="HSP-G5-UOE" id="BLL-45-Dfn"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="xP6-ML-BEH" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -322,5 +342,8 @@
         <systemColor name="systemGray6Color">
             <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
+        <systemColor name="systemYellowColor">
+            <color red="1" green="0.80000000000000004" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
     </resources>
 </document>
diff --git a/Example/EmbeddedCropViewController.swift b/Example/EmbeddedCropViewController.swift
index 0452e31b..2c709084 100644
--- a/Example/EmbeddedCropViewController.swift
+++ b/Example/EmbeddedCropViewController.swift
@@ -14,21 +14,47 @@ class EmbeddedCropViewController: UIViewController {
     var image: UIImage?
     var cropViewController: CropViewController?
     
+    weak var toolbarDelegate: CropToolbarDelegate?
+    
     var didGetCroppedImage: ((UIImage) -> Void)?
     
     @IBOutlet weak var cancelButton: UIBarButtonItem!
     @IBOutlet weak var doneButton: UIBarButtonItem!
     @IBOutlet weak var resolutionLabel: UILabel!
     
+    @IBOutlet weak var undoButton: UIBarButtonItem!
+    @IBOutlet weak var redoButton: UIBarButtonItem!
+    @IBOutlet weak var resetButton: UIBarButtonItem!
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        undoButton.title = "Undo"
+        redoButton.title = "Redo"
         cancelButton.title = "Cancel"
         doneButton.title = "Done"
+        resetButton.title = "Revert"
+        
         resolutionLabel.text = "\(getResolution(image: image) ?? "unknown")"
         
         view.backgroundColor = .black
         navigationController?.toolbar.backgroundColor = .black
+        
+        self.undoButton.isEnabled = false
+        self.redoButton.isEnabled = false
+        self.resetButton.isEnabled = false
+    }
+    
+    @IBAction func undoButtonPressed(_ sender: Any) {
+        toolbarDelegate?.didSelectUndo()
+    }
+    
+    @IBAction func redoButtonPressed(_ sender: Any) {
+        toolbarDelegate?.didSelectRedo()
+    }
+    
+    @IBAction func resetButtonPressed(_ sender: Any) {
+        cropViewController?.didSelectReset()
     }
     
     @IBAction func cancel(_ sender: Any) {
@@ -48,9 +74,14 @@ class EmbeddedCropViewController: UIViewController {
                     
         var config = Mantis.Config()
         config.cropToolbarConfig.mode = .embedded
+        config.enableUndoRedo = true
+        
+        config.cropToolbarConfig.toolbarButtonOptions = [.counterclockwiseRotate, .clockwiseRotate, .horizontallyFlip, .verticallyFlip]
+        
         Mantis.setupCropViewController(cropViewController, with: image, and: config)
         
         self.cropViewController = cropViewController
+        self.toolbarDelegate = cropViewController
     }
     
     private func getResolution(image: UIImage?) -> String? {
@@ -59,9 +90,76 @@ class EmbeddedCropViewController: UIViewController {
         }
         return nil
     }
+    
+    override func canPerformAction(_ action: Selector, withSender sender: Any?) -> Bool {
+        
+        if action == #selector(EmbeddedCropViewController.undoButtonPressed(_:)) ||
+           action == #selector(EmbeddedCropViewController.redoButtonPressed(_:))  ||
+           action == #selector(EmbeddedCropViewController.resetButtonPressed(_:)) {
+            
+            guard let toolbarDelegate = toolbarDelegate else { return false }
+
+            return toolbarDelegate.isUndoSupported()
+        }
+        
+        return true
+    }
+    
+    override func validate(_ command: UICommand) {
+        
+        guard let toolbarDelegate = toolbarDelegate else { return }
+        
+        if toolbarDelegate.isUndoSupported() {
+           
+            if command.action == #selector(EmbeddedCropViewController.undoButtonPressed(_:)) {
+                
+                let undoString = NSLocalizedString("Undo", comment: "Undo")
+                
+                command.title = self.undoButton.isEnabled ? "\(undoString) \(toolbarDelegate.undoActionName())" : undoString
+                
+                if !self.undoButton.isEnabled {
+                    command.attributes = [.disabled]
+                }
+            }
+            
+            if command.action == #selector(EmbeddedCropViewController.redoButtonPressed(_:)) {
+                
+                let redoString = NSLocalizedString("Redo", comment: "Redo")
+                
+                command.title = self.redoButton.isEnabled ? "\(redoString) \(toolbarDelegate.redoActionName())" : redoString
+                
+                if !self.redoButton.isEnabled {
+                    command.attributes = [.disabled]
+                }
+            }
+            
+            if command.action == #selector(EmbeddedCropViewController.resetButtonPressed(_:)) {
+                
+                command.title = NSLocalizedString("Revert to Original", comment: "Revert to Original")
+                
+                if !self.resetButton.isEnabled {
+                    command.attributes = [.disabled]
+                }
+            }
+        }
+    }
+
 }
 
 extension EmbeddedCropViewController: CropViewControllerDelegate {
+    
+    func cropViewController(_ cropViewController: CropViewController, didUpdateEnableStateForUndo enable: Bool) {
+        self.undoButton.isEnabled = enable
+    }
+    
+    func cropViewController(_ cropViewController: CropViewController, didUpdateEnableStateForRedo enable: Bool) {
+        self.redoButton.isEnabled = enable
+    }
+    
+    func cropViewController(_ cropViewController: CropViewController, didUpdateEnableStateForReset enable: Bool) {
+        self.resetButton.isEnabled = enable
+    }
+    
     func cropViewControllerDidCrop(_ cropViewController: CropViewController,
                                    cropped: UIImage,
                                    transformation: Transformation,
@@ -82,5 +180,5 @@ extension EmbeddedCropViewController: CropViewControllerDelegate {
         let size = cropViewController.getExpectedCropImageSize()
         self.resolutionLabel.text = "\(Int(size.width)) x \(Int(size.height)) pixels"
     }
-
 }
+
diff --git a/Example/MantisExample.xcodeproj/project.pbxproj b/Example/MantisExample.xcodeproj/project.pbxproj
index 8e4e1ea2..500a3985 100644
--- a/Example/MantisExample.xcodeproj/project.pbxproj
+++ b/Example/MantisExample.xcodeproj/project.pbxproj
@@ -3,12 +3,11 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
-		1AC3B46DF36D97844A4CEA4E /* Pods_MantisExampleTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B100014666B3974EEDE05B0C /* Pods_MantisExampleTests.framework */; };
-		37F095D77401112C083BB830 /* Pods_MantisExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A7EAB9797A43C2A34E26823 /* Pods_MantisExample.framework */; };
+		3E5A418D8A9C14BAF7DD36AE /* libPods-MantisExampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D9A44CC9D29500B4D273713B /* libPods-MantisExampleTests.a */; };
 		5F0852B5237918510031B75D /* ImagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F0852B4237918510031B75D /* ImagePicker.swift */; };
 		5FC10B15217A9EDF00582874 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FC10B14217A9EDF00582874 /* AppDelegate.swift */; };
 		5FC10B17217A9EDF00582874 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FC10B16217A9EDF00582874 /* ViewController.swift */; };
@@ -20,6 +19,7 @@
 		5FEBA88221961E4A0018DE62 /* EmbeddedCropViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FEBA88121961E4A0018DE62 /* EmbeddedCropViewController.swift */; };
 		66F909BD287B601A007E2FC6 /* MyNavigationCropToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66F909BC287B601A007E2FC6 /* MyNavigationCropToolbar.swift */; };
 		85DDBACD298E5A54004FBFE7 /* CustomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85DDBACC298E5A54004FBFE7 /* CustomViewController.swift */; };
+		9584621CBB178C95456D3612 /* libPods-MantisExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B1CAEE435A112962971BBC20 /* libPods-MantisExample.a */; };
 		CCBF2F602525B3050081B8FE /* CustomizedCropToolbarWithoutList.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCBF2F5F2525B3050081B8FE /* CustomizedCropToolbarWithoutList.swift */; };
 		F24DCFE529A8FA7F00D8E8C1 /* CustomWaitingIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = F24DCFE429A8FA7F00D8E8C1 /* CustomWaitingIndicator.swift */; };
 /* End PBXBuildFile section */
@@ -35,7 +35,6 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		3A7EAB9797A43C2A34E26823 /* Pods_MantisExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MantisExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3FC821D838EDAC646C860226 /* Pods-MantisExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MantisExampleTests.debug.xcconfig"; path = "Target Support Files/Pods-MantisExampleTests/Pods-MantisExampleTests.debug.xcconfig"; sourceTree = "<group>"; };
 		5F0852B4237918510031B75D /* ImagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePicker.swift; sourceTree = "<group>"; };
 		5F21BBB22448036100B7B0C2 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -58,8 +57,9 @@
 		85DDBACC298E5A54004FBFE7 /* CustomViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomViewController.swift; sourceTree = "<group>"; };
 		89C5370690AB91AB238B90E9 /* Pods-MantisExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MantisExample.release.xcconfig"; path = "Target Support Files/Pods-MantisExample/Pods-MantisExample.release.xcconfig"; sourceTree = "<group>"; };
 		9326C1CDF121300C5CAAE2BE /* Pods-MantisExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MantisExample.debug.xcconfig"; path = "Target Support Files/Pods-MantisExample/Pods-MantisExample.debug.xcconfig"; sourceTree = "<group>"; };
-		B100014666B3974EEDE05B0C /* Pods_MantisExampleTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MantisExampleTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B1CAEE435A112962971BBC20 /* libPods-MantisExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MantisExample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		CCBF2F5F2525B3050081B8FE /* CustomizedCropToolbarWithoutList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomizedCropToolbarWithoutList.swift; sourceTree = "<group>"; };
+		D9A44CC9D29500B4D273713B /* libPods-MantisExampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MantisExampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		F24DCFE429A8FA7F00D8E8C1 /* CustomWaitingIndicator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomWaitingIndicator.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -68,7 +68,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				37F095D77401112C083BB830 /* Pods_MantisExample.framework in Frameworks */,
+				9584621CBB178C95456D3612 /* libPods-MantisExample.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -76,7 +76,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1AC3B46DF36D97844A4CEA4E /* Pods_MantisExampleTests.framework in Frameworks */,
+				3E5A418D8A9C14BAF7DD36AE /* libPods-MantisExampleTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -86,8 +86,8 @@
 		5F3BE15921993A7C005C4BD8 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				3A7EAB9797A43C2A34E26823 /* Pods_MantisExample.framework */,
-				B100014666B3974EEDE05B0C /* Pods_MantisExampleTests.framework */,
+				B1CAEE435A112962971BBC20 /* libPods-MantisExample.a */,
+				D9A44CC9D29500B4D273713B /* libPods-MantisExampleTests.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -156,7 +156,7 @@
 				5FC10B0D217A9EDF00582874 /* Sources */,
 				5FC10B0E217A9EDF00582874 /* Frameworks */,
 				5FC10B0F217A9EDF00582874 /* Resources */,
-				800F1564269B4B40CE61575F /* [CP] Embed Pods Frameworks */,
+				0EA6FA8883379671AEAFBD66 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -270,21 +270,21 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		800F1564269B4B40CE61575F /* [CP] Embed Pods Frameworks */ = {
+		0EA6FA8883379671AEAFBD66 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-MantisExample/Pods-MantisExample-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-MantisExample/Pods-MantisExample-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Embed Pods Frameworks";
+			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-MantisExample/Pods-MantisExample-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-MantisExample/Pods-MantisExample-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MantisExample/Pods-MantisExample-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MantisExample/Pods-MantisExample-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		B990B0C0191568D739FE220D /* [CP] Check Pods Manifest.lock */ = {
@@ -498,7 +498,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
-				DEVELOPMENT_TEAM = 3V26Q55U3S;
+				DEVELOPMENT_TEAM = Z9GT6JU7N2;
 				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -524,7 +524,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
-				DEVELOPMENT_TEAM = 3V26Q55U3S;
+				DEVELOPMENT_TEAM = Z9GT6JU7N2;
 				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -548,7 +548,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 3V26Q55U3S;
+				DEVELOPMENT_TEAM = Z9GT6JU7N2;
 				INFOPLIST_FILE = MantisTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -571,7 +571,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 3V26Q55U3S;
+				DEVELOPMENT_TEAM = Z9GT6JU7N2;
 				INFOPLIST_FILE = MantisTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
diff --git a/Example/MantisExample.xcodeproj/xcshareddata/xcschemes/MantisExample.xcscheme b/Example/MantisExample.xcodeproj/xcshareddata/xcschemes/MantisExample.xcscheme
index 2142da76..a16f46ae 100644
--- a/Example/MantisExample.xcodeproj/xcshareddata/xcschemes/MantisExample.xcscheme
+++ b/Example/MantisExample.xcodeproj/xcshareddata/xcschemes/MantisExample.xcscheme
@@ -34,6 +34,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = "ar"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Example/ViewController.swift b/Example/ViewController.swift
index f06ef8d0..8129b81c 100644
--- a/Example/ViewController.swift
+++ b/Example/ViewController.swift
@@ -83,6 +83,7 @@ class ViewController: UIViewController {
                                                                 height: 704.9696330065433),
                                        horizontallyFlipped: true,
                                        verticallyFlipped: false)
+        
         config.cropToolbarConfig.toolbarButtonOptions = [.clockwiseRotate, .reset, .ratio, .autoAdjust, .horizontallyFlip]
         config.cropViewConfig.presetTransformationType = .presetInfo(info: transform)
         config.cropViewConfig.builtInRotationControlViewType = .slideDial()
@@ -307,10 +308,6 @@ extension ViewController: CropViewControllerDelegate {
         dismiss(animated: true)
     }
     
-    func cropViewControllerDidImageTransformed(_ cropViewController: CropViewController, transformation: Transformation) {
-        print("image is transformed. transformation is \(transformation)")
-    }
-    
     func cropViewController(_ cropViewController: CropViewController, didBecomeResettable resettable: Bool) {
         print("Is resettable: \(resettable)")
     }
diff --git a/Example/zh-Hans.lproj/Main.storyboard b/Example/zh-Hans.lproj/Main.storyboard
index 37a540cb..13dc7967 100644
--- a/Example/zh-Hans.lproj/Main.storyboard
+++ b/Example/zh-Hans.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="ipad7_9" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -13,11 +13,11 @@
             <objects>
                 <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="MantisExample" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <rect key="frame" x="0.0" y="0.0" width="744" height="1133"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="vyB-So-c13">
-                                <rect key="frame" x="57" y="626" width="300" height="216"/>
+                                <rect key="frame" x="222" y="877" width="300" height="216"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fpr-TJ-i7J">
                                         <rect key="frame" x="0.0" y="0.0" width="300" height="36"/>
@@ -74,7 +74,7 @@
                                 </constraints>
                             </stackView>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sunflower" translatesAutoresizingMaskIntoConstraints="NO" id="pUS-Eo-0ui" userLabel="Cropped Image">
-                                <rect key="frame" x="40" y="44" width="334" height="558"/>
+                                <rect key="frame" x="40" y="24" width="664" height="829"/>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
@@ -100,26 +100,6 @@
         <scene sceneID="Mwe-jr-1zI">
             <objects>
                 <viewController id="aIe-ND-Zfg" customClass="EmbeddedCropViewController" customModule="MantisExample" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="FS5-2F-Jir">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="813"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lwW-G6-m16">
-                                <rect key="frame" x="0.0" y="44" width="414" height="769"/>
-                                <connections>
-                                    <segue destination="xJq-Ev-XcJ" kind="embed" id="WEI-AV-e4o"/>
-                                </connections>
-                            </containerView>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="cY0-Cd-i0E"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        <constraints>
-                            <constraint firstItem="lwW-G6-m16" firstAttribute="top" secondItem="cY0-Cd-i0E" secondAttribute="top" id="F4s-gV-IK0"/>
-                            <constraint firstItem="lwW-G6-m16" firstAttribute="leading" secondItem="cY0-Cd-i0E" secondAttribute="leading" id="Rbf-LE-Lbb"/>
-                            <constraint firstItem="cY0-Cd-i0E" firstAttribute="trailing" secondItem="lwW-G6-m16" secondAttribute="trailing" id="XLc-Sl-Rfe"/>
-                            <constraint firstItem="cY0-Cd-i0E" firstAttribute="bottom" secondItem="lwW-G6-m16" secondAttribute="bottom" id="yuD-jJ-uPY"/>
-                        </constraints>
-                    </view>
                     <toolbarItems>
                         <barButtonItem title="Cancel" id="5p4-Ob-R9b">
                             <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -127,6 +107,24 @@
                                 <action selector="cancel:" destination="aIe-ND-Zfg" id="j3e-ai-8lv"/>
                             </connections>
                         </barButtonItem>
+                        <barButtonItem title="Undo" style="plain" id="Trh-my-yCW">
+                            <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <connections>
+                                <action selector="undoButtonPressed:" destination="aIe-ND-Zfg" id="xT7-QW-5SL"/>
+                            </connections>
+                        </barButtonItem>
+                        <barButtonItem title="Redo" id="eY1-KB-ReS">
+                            <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <connections>
+                                <action selector="redoButtonPressed:" destination="aIe-ND-Zfg" id="UZD-3H-yAt"/>
+                            </connections>
+                        </barButtonItem>
+                        <barButtonItem title="Reset" id="R4y-9o-HJD">
+                            <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <connections>
+                                <action selector="resetButtonPressed:" destination="aIe-ND-Zfg" id="fnZ-db-bPg"/>
+                            </connections>
+                        </barButtonItem>
                         <barButtonItem style="plain" systemItem="flexibleSpace" id="DsY-rM-AWO"/>
                         <barButtonItem systemItem="bookmarks" id="sQZ-M0-ZLt">
                             <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -150,6 +148,9 @@
                     <connections>
                         <outlet property="cancelButton" destination="5p4-Ob-R9b" id="kQq-ir-MSf"/>
                         <outlet property="doneButton" destination="kZP-3N-vXv" id="RPY-W3-vWu"/>
+                        <outlet property="redoButton" destination="eY1-KB-ReS" id="NnV-9U-A2e"/>
+                        <outlet property="resetButton" destination="R4y-9o-HJD" id="V2b-qs-QBP"/>
+                        <outlet property="undoButton" destination="Trh-my-yCW" id="ZQx-n1-lmk"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="xP6-ML-BEH" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -168,7 +169,7 @@
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <toolbar key="toolbar" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translucent="NO" id="KpB-vr-mGb">
-                        <rect key="frame" x="0.0" y="813" width="414" height="49"/>
+                        <rect key="frame" x="0.0" y="1083" width="744" height="50"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="barTintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </toolbar>
@@ -185,7 +186,7 @@
             <objects>
                 <viewController id="xJq-Ev-XcJ" customClass="CropViewController" customModule="Mantis" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="nLp-HP-0xC">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="769"/>
+                        <rect key="frame" x="0.0" y="0.0" width="744" height="1133"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <viewLayoutGuide key="safeArea" id="0JZ-7h-zil"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
diff --git a/Mantis.xcodeproj/project.pbxproj b/Mantis.xcodeproj/project.pbxproj
index 0558251b..1aa554fe 100644
--- a/Mantis.xcodeproj/project.pbxproj
+++ b/Mantis.xcodeproj/project.pbxproj
@@ -64,6 +64,10 @@
 		66F909BF287D22E7007E2FC6 /* ToolBarButtonImageBuilder+DrawImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66F909BE287D22E7007E2FC6 /* ToolBarButtonImageBuilder+DrawImage.swift */; };
 		8EFB6F6725D16B0F00C0DDB2 /* MantisLocalizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8EFB6F3525D154D900C0DDB2 /* MantisLocalizable.strings */; };
 		8EFB6FB125D187A000C0DDB2 /* Resource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8EFB6F5425D16A9E00C0DDB2 /* Resource.bundle */; };
+		97D3A0192BAD491A00DEB1D6 /* TransformStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D3A0172BAD491A00DEB1D6 /* TransformStack.swift */; };
+		97D3A01A2BAD491A00DEB1D6 /* TransformRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D3A0182BAD491A00DEB1D6 /* TransformRecord.swift */; };
+		97D3A01C2BAD494300DEB1D6 /* TransformDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D3A01B2BAD494300DEB1D6 /* TransformDelegate.swift */; };
+		97FA9A852BAFA570001E67D9 /* TransformStackTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97FA9A842BAFA570001E67D9 /* TransformStackTests.swift */; };
 		F2058F252A4004E3008DEBAA /* SlideDialConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2058F242A4004E3008DEBAA /* SlideDialConfig.swift */; };
 		F2058F272A400508008DEBAA /* SlideDialViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2058F262A400508008DEBAA /* SlideDialViewModel.swift */; };
 		F2058F292A417D97008DEBAA /* SlideDialTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2058F282A417D97008DEBAA /* SlideDialTests.swift */; };
@@ -196,6 +200,10 @@
 		8EFB6F4125D154D900C0DDB2 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/MantisLocalizable.strings; sourceTree = "<group>"; };
 		8EFB6F4225D154D900C0DDB2 /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/MantisLocalizable.strings"; sourceTree = "<group>"; };
 		8EFB6F5425D16A9E00C0DDB2 /* Resource.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Resource.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
+		97D3A0172BAD491A00DEB1D6 /* TransformStack.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransformStack.swift; sourceTree = "<group>"; };
+		97D3A0182BAD491A00DEB1D6 /* TransformRecord.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransformRecord.swift; sourceTree = "<group>"; };
+		97D3A01B2BAD494300DEB1D6 /* TransformDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransformDelegate.swift; sourceTree = "<group>"; };
+		97FA9A842BAFA570001E67D9 /* TransformStackTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransformStackTests.swift; sourceTree = "<group>"; };
 		E86127BD26206D01008365BC /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/MantisLocalizable.strings; sourceTree = "<group>"; };
 		F2058F242A4004E3008DEBAA /* SlideDialConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SlideDialConfig.swift; sourceTree = "<group>"; };
 		F2058F262A400508008DEBAA /* SlideDialViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SlideDialViewModel.swift; sourceTree = "<group>"; };
@@ -300,6 +308,7 @@
 		66100E05294B7040001C8593 /* Protocols */ = {
 			isa = PBXGroup;
 			children = (
+				97D3A01B2BAD494300DEB1D6 /* TransformDelegate.swift */,
 				66100E06294B7059001C8593 /* CropViewProtocol.swift */,
 				5F7D22AD245BCA8D0015A0D5 /* CropToolbarProtocol.swift */,
 				66100E0A294BAE83001C8593 /* CropViewModelProtocol.swift */,
@@ -396,6 +405,8 @@
 		OBJ_33 /* Helpers */ = {
 			isa = PBXGroup;
 			children = (
+				97D3A0182BAD491A00DEB1D6 /* TransformRecord.swift */,
+				97D3A0172BAD491A00DEB1D6 /* TransformStack.swift */,
 				F2AD53402A46DB8B00AE9C87 /* ImageAutoAdjustHelper.swift */,
 				5F17E409253535F300A3EB7D /* Orientation.swift */,
 				OBJ_34 /* GeometryHelper.swift */,
@@ -464,6 +475,7 @@
 				660D4F68298F99D900C4E11A /* CropMaskViewManagerTests.swift */,
 				F251B36D299B9A52006325B0 /* CropWorkbenchViewTests.swift */,
 				F24DCFE729AB0A7000D8E8C1 /* CropAuxiliaryIndicatorViewTests.swift */,
+				97FA9A842BAFA570001E67D9 /* TransformStackTests.swift */,
 			);
 			name = MantisTests;
 			path = Tests/MantisTests;
@@ -698,6 +710,7 @@
 			buildActionMask = 0;
 			files = (
 				F251B36E299B9A52006325B0 /* CropWorkbenchViewTests.swift in Sources */,
+				97FA9A852BAFA570001E67D9 /* TransformStackTests.swift in Sources */,
 				F24DCFE629A9E53E00D8E8C1 /* UIViewExtensions.swift in Sources */,
 				OBJ_119 /* MantisTests.swift in Sources */,
 				660D4F5D298E33F800C4E11A /* ImageContainerTests.swift in Sources */,
@@ -746,6 +759,8 @@
 				6659429F2877DC8A0096A5DB /* Enum.swift in Sources */,
 				66100E13294BAEC4001C8593 /* CropMaskViewManagerProtocol.swift in Sources */,
 				OBJ_78 /* CropViewStatus.swift in Sources */,
+				97D3A0192BAD491A00DEB1D6 /* TransformStack.swift in Sources */,
+				97D3A01A2BAD491A00DEB1D6 /* TransformRecord.swift in Sources */,
 				OBJ_79 /* ImageContainer.swift in Sources */,
 				66100E07294B7059001C8593 /* CropViewProtocol.swift in Sources */,
 				66100E0F294BAEA5001C8593 /* RotationDialProtocol.swift in Sources */,
@@ -786,6 +801,7 @@
 				66100E0B294BAE83001C8593 /* CropViewModelProtocol.swift in Sources */,
 				F2B4FDA72A3B69B600667F22 /* SlideRulerPositionHelper.swift in Sources */,
 				66F43992297A123400728B52 /* CropViewControllerDelegate.swift in Sources */,
+				97D3A01C2BAD494300DEB1D6 /* TransformDelegate.swift in Sources */,
 				OBJ_99 /* RotationDial.swift in Sources */,
 				6659429D2877DAE80096A5DB /* Config.swift in Sources */,
 				OBJ_100 /* RotationDialPlate.swift in Sources */,
@@ -857,6 +873,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = Z9GT6JU7N2;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -895,6 +912,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
+				DEVELOPMENT_TEAM = Z9GT6JU7N2;
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -915,6 +933,8 @@
 		OBJ_105 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "Apple Development";
+				DEVELOPMENT_TEAM = Z9GT6JU7N2;
 				LD = /usr/bin/true;
 				OTHER_SWIFT_FLAGS = "-swift-version 5 -I $(TOOLCHAIN_DIR)/usr/lib/swift/pm/4_2 -target x86_64-apple-macosx10.10 -sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -package-description-version 5.1";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -927,6 +947,8 @@
 		OBJ_106 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "Apple Development";
+				DEVELOPMENT_TEAM = Z9GT6JU7N2;
 				LD = /usr/bin/true;
 				OTHER_SWIFT_FLAGS = "-swift-version 5 -I $(TOOLCHAIN_DIR)/usr/lib/swift/pm/4_2 -target x86_64-apple-macosx10.10 -sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -package-description-version 5.1";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -954,6 +976,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
+				DEVELOPMENT_TEAM = Z9GT6JU7N2;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PLATFORM_DIR)/Developer/Library/Frameworks",
@@ -984,6 +1007,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
+				DEVELOPMENT_TEAM = Z9GT6JU7N2;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PLATFORM_DIR)/Developer/Library/Frameworks",
@@ -1122,7 +1146,9 @@
 		OBJ_66 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = Z9GT6JU7N2;
 				ENABLE_TESTABILITY = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1158,7 +1184,9 @@
 		OBJ_67 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = Z9GT6JU7N2;
 				ENABLE_TESTABILITY = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
diff --git a/README.md b/README.md
index ac84879b..b0bb78e8 100644
--- a/README.md
+++ b/README.md
@@ -202,6 +202,17 @@ public enum PresetTransformationType {
 ```
 Please use the transformation information obtained previously from delegate method cropViewControllerDidCrop(_ cropViewController: CropViewController, cropped: UIImage, transformation: Transformation, , cropInfo: CropInfo).
 
+</details>
+
+<details>
+<summary><strong>Undo/Redo Support</strong></summary>
+
+* Mantis offers full support for Undo, Redo, Revert to Original in both iOS and Catalyst.
+
+* If you want to add support for this feature, set Mantis.Config.enableUndoRedo = true
+
+* Catalyst menus for this feature are localized.
+
 </details>
                 
 <details>
diff --git a/Sources/Mantis/Config.swift b/Sources/Mantis/Config.swift
index cafdef04..5fc1b614 100644
--- a/Sources/Mantis/Config.swift
+++ b/Sources/Mantis/Config.swift
@@ -67,6 +67,8 @@ public struct Config {
         return Bundle(url: url)
     }()
     
+    public var enableUndoRedo: Bool = false
+    
     static var language: Language?
 
     public init() {}
diff --git a/Sources/Mantis/CropData.swift b/Sources/Mantis/CropData.swift
index efba11f0..d2c2fb1c 100644
--- a/Sources/Mantis/CropData.swift
+++ b/Sources/Mantis/CropData.swift
@@ -24,17 +24,68 @@
 
 import UIKit
 
-public typealias Transformation = (
-    offset: CGPoint,
-    rotation: CGFloat,
-    scale: CGFloat,
-    isManuallyZoomed: Bool,
-    initialMaskFrame: CGRect,
-    maskFrame: CGRect,
-    cropWorkbenchViewBounds: CGRect,
-    horizontallyFlipped: Bool,
-    verticallyFlipped: Bool
-)
+struct CropState: Equatable {
+    var rotationType: ImageRotationType
+    var degrees: CGFloat
+    var aspectRatioLockEnabled: Bool
+    var aspectRato: CGFloat
+    var flipOddTimes: Bool
+    var transformation: Transformation
+    
+    init(rotationType: ImageRotationType, degrees: CGFloat, aspectRatioLockEnabled: Bool, aspectRato: CGFloat, flipOddTimes: Bool, transformation: Transformation) {
+        self.rotationType = rotationType
+        self.degrees = degrees
+        self.aspectRatioLockEnabled = aspectRatioLockEnabled
+        self.aspectRato = aspectRato
+        self.flipOddTimes = flipOddTimes
+        self.transformation = transformation
+    }
+    
+    static func ==(lhs: CropState, rhs: CropState) -> Bool {
+        return lhs.rotationType == rhs.rotationType
+        && lhs.degrees == rhs.degrees
+        && lhs.aspectRatioLockEnabled == rhs.aspectRatioLockEnabled
+        && lhs.aspectRato == rhs.aspectRato
+        && lhs.flipOddTimes == rhs.flipOddTimes
+        && lhs.transformation == rhs.transformation
+    }
+}
+
+public struct Transformation: Equatable {
+    var offset: CGPoint
+    var rotation: CGFloat
+    var scale: CGFloat
+    var isManuallyZoomed: Bool
+    var initialMaskFrame: CGRect
+    var maskFrame: CGRect
+    var cropWorkbenchViewBounds: CGRect
+    var horizontallyFlipped: Bool
+    var verticallyFlipped: Bool
+    
+    public init(offset: CGPoint, rotation: CGFloat, scale: CGFloat, isManuallyZoomed: Bool, initialMaskFrame: CGRect, maskFrame: CGRect, cropWorkbenchViewBounds: CGRect, horizontallyFlipped: Bool, verticallyFlipped: Bool) {
+        self.offset = offset
+        self.rotation = rotation
+        self.scale = scale
+        self.isManuallyZoomed = isManuallyZoomed
+        self.initialMaskFrame = initialMaskFrame
+        self.maskFrame = maskFrame
+        self.cropWorkbenchViewBounds = cropWorkbenchViewBounds
+        self.horizontallyFlipped = horizontallyFlipped
+        self.verticallyFlipped = verticallyFlipped
+    }
+    
+    public static func ==(lhs: Transformation, rhs: Transformation) -> Bool {
+        return lhs.offset == rhs.offset
+        && lhs.rotation == rhs.rotation
+        && lhs.scale == rhs.scale
+        && lhs.isManuallyZoomed == rhs.isManuallyZoomed
+        && lhs.initialMaskFrame == rhs.initialMaskFrame
+        && lhs.maskFrame == rhs.maskFrame
+        && lhs.cropWorkbenchViewBounds == rhs.cropWorkbenchViewBounds
+        && lhs.horizontallyFlipped == rhs.horizontallyFlipped
+        && lhs.verticallyFlipped == rhs.verticallyFlipped
+    }
+}
 
 public struct CropRegion: Equatable {
     public var topLeft: CGPoint
diff --git a/Sources/Mantis/CropView/CropView+Touches.swift b/Sources/Mantis/CropView/CropView+Touches.swift
index ff192165..9f26d5e1 100644
--- a/Sources/Mantis/CropView/CropView+Touches.swift
+++ b/Sources/Mantis/CropView/CropView+Touches.swift
@@ -65,7 +65,10 @@ extension CropView {
         }
         
         let touchPoint = touch.location(in: self)
-        updateCropBoxFrame(withTouchPoint: touchPoint)
+        
+        if touchPoint != viewModel.panOriginPoint {
+            updateCropBoxFrame(withTouchPoint: touchPoint)
+        }
     }
     
     override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
diff --git a/Sources/Mantis/CropView/CropView+UIScrollViewDelegate.swift b/Sources/Mantis/CropView/CropView+UIScrollViewDelegate.swift
index 455fdfb6..7cfc9fb9 100644
--- a/Sources/Mantis/CropView/CropView+UIScrollViewDelegate.swift
+++ b/Sources/Mantis/CropView/CropView+UIScrollViewDelegate.swift
@@ -14,6 +14,7 @@ extension CropView: UIScrollViewDelegate {
     }
     
     func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
+        delegate?.cropViewDidBeginCrop(self)
         viewModel.setTouchImageStatus()
     }
     
diff --git a/Sources/Mantis/CropView/CropView.swift b/Sources/Mantis/CropView/CropView.swift
index 773fbfb6..9bbb6502 100644
--- a/Sources/Mantis/CropView/CropView.swift
+++ b/Sources/Mantis/CropView/CropView.swift
@@ -29,6 +29,7 @@ protocol CropViewDelegate: AnyObject {
     func cropViewDidBecomeUnResettable(_ cropView: CropViewProtocol)
     func cropViewDidBeginResize(_ cropView: CropViewProtocol)
     func cropViewDidEndResize(_ cropView: CropViewProtocol)
+    func cropViewDidBeginCrop(_ cropView: CropViewProtocol)
 }
 
 final class CropView: UIView {
@@ -655,6 +656,18 @@ extension CropView {
         }
     }
     
+    public func makeCropState() -> CropState {
+        
+        return CropState(
+            rotationType: viewModel.rotationType,
+            degrees: viewModel.degrees,
+            aspectRatioLockEnabled: aspectRatioLockEnabled,
+            aspectRato: viewModel.fixedImageRatio,
+            flipOddTimes: flipOddTimes,
+            transformation: makeTransformation()
+        )
+    }
+    
     func makeTransformation() -> Transformation {
         Transformation(
             offset: cropWorkbenchView.contentOffset,
@@ -866,6 +879,7 @@ extension CropView: CropViewProtocol {
     }
     
     func setFixedRatio(_ ratio: Double, zoom: Bool = true, presetFixedRatioType: PresetFixedRatioType) {
+       
         aspectRatioLockEnabled = true
         
         if viewModel.fixedImageRatio != CGFloat(ratio) {
@@ -956,7 +970,28 @@ extension CropView: CropViewProtocol {
         viewModel.fixedImageRatio = -1
     }
     
+    public func applyCropState(with cropState: CropState) {
+        viewModel.rotationType = .none
+        viewModel.horizontallyFlip = cropState.transformation.horizontallyFlipped
+        viewModel.verticallyFlip = cropState.transformation.verticallyFlipped
+        viewModel.fixedImageRatio = cropState.aspectRato
+        flipOddTimes = cropState.flipOddTimes
+        
+        let newTransform = getTransformInfo(byTransformInfo: cropState.transformation)
+        
+        if newTransform.maskFrame != .zero {
+             viewModel.cropBoxFrame = newTransform.maskFrame
+        }
+        
+        transform(byTransformInfo: newTransform)
+        
+        viewModel.degrees = cropState.degrees
+        viewModel.rotationType = cropState.rotationType
+        aspectRatioLockEnabled = cropState.aspectRatioLockEnabled
+    }
+    
     func transform(byTransformInfo transformation: Transformation, isUpdateRotationControlView: Bool = true) {
+        
         viewModel.setRotatingStatus(by: Angle(radians: transformation.rotation))
         
         if transformation.cropWorkbenchViewBounds != .zero {
@@ -966,6 +1001,7 @@ extension CropView: CropViewProtocol {
         isManuallyZoomed = transformation.isManuallyZoomed
         cropWorkbenchView.zoomScale = transformation.scale
         cropWorkbenchView.contentOffset = transformation.offset
+        
         viewModel.setBetweenOperationStatus()
         
         if transformation.maskFrame != .zero {
@@ -987,13 +1023,17 @@ extension CropView: CropViewProtocol {
         var maskFrameHeight: CGFloat
         
         if transformInfo.maskFrame.height / transformInfo.maskFrame.width >= contentBound.height / contentBound.width {
+            
             maskFrameHeight = contentBound.height
             maskFrameWidth = transformInfo.maskFrame.width / transformInfo.maskFrame.height * maskFrameHeight
             adjustScale = maskFrameHeight / transformInfo.maskFrame.height
+            
         } else {
+            
             maskFrameWidth = contentBound.width
             maskFrameHeight = transformInfo.maskFrame.height / transformInfo.maskFrame.width * maskFrameWidth
             adjustScale = maskFrameWidth / transformInfo.maskFrame.width
+            
         }
         
         var newTransform = transformInfo
diff --git a/Sources/Mantis/CropViewController/CropViewController.swift b/Sources/Mantis/CropViewController/CropViewController.swift
index 792579ab..a028764e 100644
--- a/Sources/Mantis/CropViewController/CropViewController.swift
+++ b/Sources/Mantis/CropViewController/CropViewController.swift
@@ -26,7 +26,13 @@ import UIKit
 
 open class CropViewController: UIViewController {
     public weak var delegate: CropViewControllerDelegate?
-    public var config = Mantis.Config()
+    public var config = Mantis.Config() {
+        didSet {
+            if config.enableUndoRedo {
+                TransformStack.shared.transformDelegate = self
+            }
+        }
+    }
     
     var cropView: CropViewProtocol! {
         didSet {
@@ -45,13 +51,31 @@ open class CropViewController: UIViewController {
     private var initialLayout = false
     private var disableRotation = false
     
+    private lazy var _undoManager : UndoManager = {
+        return UndoManager()
+    }()
+   
+    private var isCropStateUserGenerated: Bool = false
+    
+    private var previousCropState: CropState! {
+        didSet {
+            isCropStateUserGenerated = true
+        }
+    }
+    
+    private var currentCropState: CropState! {
+        didSet {
+            isCropStateUserGenerated = false
+        }
+    }
+    
     deinit {
         print("CropViewController deinit.")
     }
 
     required public init(config: Mantis.Config = Mantis.Config()) {
         self.config = config
-
+        
         switch config.cropViewConfig.cropShapeType {
         case .circle, .square, .heart:
             self.config.presetFixedRatioType = .alwaysUsingOnePresetFixedRatio(ratio: 1)
@@ -66,6 +90,62 @@ open class CropViewController: UIViewController {
         super.init(coder: aDecoder)
     }
     
+    private func createRatioSelector() {
+        let fixedRatioManager = getFixedRatioManager()
+        ratioSelector = RatioSelector(type: fixedRatioManager.type,
+                                      originalRatioH: fixedRatioManager.originalRatioH,
+                                      ratios: fixedRatioManager.ratios)
+        ratioSelector?.didGetRatio = { [weak self] ratio in
+            self?.setFixedRatio(ratio)
+        }
+    }
+    
+    private func createCropToolbar() {
+        cropToolbar.delegate = self
+        
+        switch config.presetFixedRatioType {
+        case .alwaysUsingOnePresetFixedRatio(let ratio):
+                config.cropToolbarConfig.includeFixedRatiosSettingButton = false
+                                
+            if case .none = config.cropViewConfig.presetTransformationType {
+                    setFixedRatio(ratio)
+                }
+                
+        case .canUseMultiplePresetFixedRatio(let defaultRatio):
+                if defaultRatio > 0 {
+                    setFixedRatio(defaultRatio)
+                    cropView.aspectRatioLockEnabled = true
+                    config.cropToolbarConfig.presetRatiosButtonSelected = true
+                }
+                
+                config.cropToolbarConfig.includeFixedRatiosSettingButton = true
+        }
+        
+        cropToolbar.createToolbarUI(config: config.cropToolbarConfig)                
+    }
+    
+    private func getRatioType() -> RatioType {
+        switch config.cropToolbarConfig.fixedRatiosShowType {
+        case .adaptive:
+            return cropView.getRatioType(byImageIsOriginalHorizontal: cropView.image.isHorizontal())
+        case .horizontal:
+            return .horizontal
+        case .vertical:
+            return .vertical
+        }
+    }
+    
+    private func getFixedRatioManager() -> FixedRatioManager {
+        let type: RatioType = getRatioType()
+        
+        let ratio = cropView.getImageHorizontalToVerticalRatio()
+        
+        return FixedRatioManager(type: type,
+                                 originalRatioH: ratio,
+                                 ratioOptions: config.ratioOptions,
+                                 customRatios: config.getCustomRatioItems().compactMap { $0 })
+    }
+
     override open func viewDidLoad() {
         super.viewDidLoad()
 
@@ -85,7 +165,15 @@ open class CropViewController: UIViewController {
         updateLayout()
         showImageAutoAdjustStatusIfNeeded()
     }
-        
+    
+    func showImageAutoAdjustStatusIfNeeded() {
+        if let imageAdjustHelper = imageAdjustHelper {
+            if imageAdjustHelper.detectHorizon() {
+                cropToolbar.handleImageAutoAdjustable()
+            }
+        }
+    }
+    
     override public func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
         if initialLayout == false {
@@ -117,17 +205,7 @@ open class CropViewController: UIViewController {
         cropView.prepareForViewWillTransition()
         handleViewWillTransition()
     }
-}
-
-private extension CropViewController {
-    func showImageAutoAdjustStatusIfNeeded() {
-        if let imageAdjustHelper = imageAdjustHelper {
-            if imageAdjustHelper.detectHorizon() {
-                cropToolbar.handleImageAutoAdjustable()
-            }
-        }
-    }
-
+    
     @objc func handleViewWillTransition() {
         let currentOrientation = Orientation.interfaceOrientation
         
@@ -148,83 +226,27 @@ private extension CropViewController {
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
             self?.cropView.handleViewWillTransition()
         }
-    }
-
-    func createRatioSelector() {
-        let fixedRatioManager = getFixedRatioManager()
-        ratioSelector = RatioSelector(type: fixedRatioManager.type,
-                                      originalRatioH: fixedRatioManager.originalRatioH,
-                                      ratios: fixedRatioManager.ratios)
-        ratioSelector?.didGetRatio = { [weak self] ratio in
-            self?.setFixedRatio(ratio)
-        }
-    }
+    }    
     
-    func createCropToolbar() {
-        cropToolbar.delegate = self
-        
-        switch config.presetFixedRatioType {
-        case .alwaysUsingOnePresetFixedRatio(let ratio):
-                config.cropToolbarConfig.includeFixedRatiosSettingButton = false
-                                
-            if case .none = config.cropViewConfig.presetTransformationType {
-                    setFixedRatio(ratio)
-                }
-                
-        case .canUseMultiplePresetFixedRatio(let defaultRatio):
-                if defaultRatio > 0 {
-                    setFixedRatio(defaultRatio)
-                    cropView.aspectRatioLockEnabled = true
-                    config.cropToolbarConfig.presetRatiosButtonSelected = true
-                }
-                
-                config.cropToolbarConfig.includeFixedRatiosSettingButton = true
-        }
-        
-        cropToolbar.createToolbarUI(config: config.cropToolbarConfig)
-    }
-    
-    func getRatioType() -> RatioType {
-        switch config.cropToolbarConfig.fixedRatiosShowType {
-        case .adaptive:
-            return cropView.getRatioType(byImageIsOriginalHorizontal: cropView.image.isHorizontal())
-        case .horizontal:
-            return .horizontal
-        case .vertical:
-            return .vertical
-        }
-    }
-    
-    func getFixedRatioManager() -> FixedRatioManager {
-        let type: RatioType = getRatioType()
-        
-        let ratio = cropView.getImageHorizontalToVerticalRatio()
-        
-        return FixedRatioManager(type: type,
-                                 originalRatioH: ratio,
-                                 ratioOptions: config.ratioOptions,
-                                 customRatios: config.getCustomRatioItems().compactMap { $0 })
-    }
-
-    func setFixedRatio(_ ratio: Double, zoom: Bool = true) {
+    private func setFixedRatio(_ ratio: Double, zoom: Bool = true) {
         cropToolbar.handleFixedRatioSetted(ratio: ratio)
         cropView.setFixedRatio(ratio, zoom: zoom, presetFixedRatioType: config.presetFixedRatioType)
     }
     
-    func setFreeRatio() {
+    private func setFreeRatio() {
         resetRatioButton()
     }
     
-    func handleCancel() {
+    private func handleCancel() {
         delegate?.cropViewControllerDidCancel(self, original: cropView.image)
     }
     
-    func resetRatioButton() {
+    private func resetRatioButton() {
         cropView.setFreeCrop()
         cropToolbar.handleFixedRatioUnSetted()
     }
     
-    func isNeedToResetRatioButton() -> Bool {
+    private func isNeedToResetRatioButton() -> Bool {
         var needToResetRatioButton = false
         
         switch config.presetFixedRatioType {
@@ -239,7 +261,8 @@ private extension CropViewController {
         return needToResetRatioButton
     }
     
-    @objc func handleSetRatio() {
+    @objc private func handleSetRatio() {
+        
         if cropView.aspectRatioLockEnabled && isNeedToResetRatioButton() {
             resetRatioButton()
             return
@@ -270,7 +293,14 @@ private extension CropViewController {
         ratioPresenter?.present(by: self, in: presentSourceView)
     }
     
-    func handleReset() {
+    private func handleReset() {
+              
+        var previous: CropState! = nil
+
+        if config.enableUndoRedo {
+            previous = cropView.makeCropState()
+        }
+        
         if isNeedToResetRatioButton() {
             resetRatioButton()
         }
@@ -279,31 +309,43 @@ private extension CropViewController {
         ratioSelector?.reset()
         ratioSelector?.update(fixedRatioManager: getFixedRatioManager())
         showImageAutoAdjustStatusIfNeeded()
+        
+        if config.enableUndoRedo {
+            let current = cropView.makeCropState()
+            TransformStack.shared.pushTransformRecordOntoStack(transformType: .resetTransforms, previous: previous, current: current, userGenerated: true)
+        }
     }
     
-    func handleRotate(withRotateType rotateType: RotateBy90DegreeType) {
+    private func handleRotate(withRotateType rotateType: RotateBy90DegreeType) {
         if !disableRotation {
             disableRotation = true
             cropView.rotateBy90(withRotateType: rotateType) { [weak self] in
                 self?.disableRotation = false
                 self?.ratioSelector?.update(fixedRatioManager: self?.getFixedRatioManager())
             }
-        }
+        }        
+    }
+    
+    private func handleTransform(with cropState: CropState) {
+        
+        cropView.applyCropState(with: cropState)
+        
+        view.setNeedsLayout()
     }
     
-    func handleAlterCropper90Degree() {
+    private func handleAlterCropper90Degree() {
         cropView.handleAlterCropper90Degree()
     }
     
-    func handleHorizontallyFlip() {
+    private func handleHorizontallyFlip() {
         cropView.horizontallyFlip()
     }
     
-    func handleVerticallyFlip() {
+    private func handleVerticallyFlip() {
         cropView.verticallyFlip()
     }
     
-    func handleAutoAdjust(isActive: Bool) {
+    private func handleAutoAdjust(isActive: Bool) {
         if let angle = imageAdjustHelper?.adjustAngle {
             cropView.reset()
             if isActive {
@@ -312,14 +354,14 @@ private extension CropViewController {
         }
     }
     
-    func handleCrop() {
+    private func handleCrop() {
         crop()
     }
 }
 
 // Auto layout
-private extension CropViewController {
-    func initLayout() {
+extension CropViewController {
+    private func initLayout() {
         cropStackView = UIStackView()
         cropStackView.axis = .vertical
         cropStackView.addArrangedSubview(cropView)
@@ -341,7 +383,7 @@ private extension CropViewController {
         stackView?.rightAnchor.constraint(equalTo: view.safeAreaLayoutGuide.rightAnchor).isActive = true
     }
     
-    func setStackViewAxis() {
+    private func setStackViewAxis() {
         if Orientation.treatAsPortrait {
             stackView?.axis = .vertical
         } else if Orientation.isLandscape {
@@ -349,7 +391,7 @@ private extension CropViewController {
         }
     }
     
-    func changeStackViewOrder() {
+    private func changeStackViewOrder() {
         guard config.showAttachedCropToolbar else {
             stackView?.removeArrangedSubview(cropStackView)
             stackView?.addArrangedSubview(cropStackView)
@@ -368,7 +410,7 @@ private extension CropViewController {
         }
     }
             
-    func updateLayout() {
+    private func updateLayout() {
         setStackViewAxis()
         cropToolbar.respondToOrientationChange()
         changeStackViewOrder()
@@ -378,9 +420,21 @@ private extension CropViewController {
 extension CropViewController: CropViewDelegate {    
     func cropViewDidBecomeResettable(_ cropView: CropViewProtocol) {
         cropToolbar.handleCropViewDidBecomeResettable()
-        delegate?.cropViewControllerDidImageTransformed(self)
         delegate?.cropViewControllerDidImageTransformed(self, transformation: cropView.makeTransformation())
         delegate?.cropViewController(self, didBecomeResettable: true)
+        
+        if config.enableUndoRedo {
+            guard let previous = previousCropState else { return }
+            let userGenerated = isCropStateUserGenerated
+            currentCropState = cropView.makeCropState()
+            
+            if previous != currentCropState {
+                TransformStack.shared.pushTransformRecordOntoStack(transformType: .transform, previous: previous, current: currentCropState, userGenerated: userGenerated)
+            }
+            
+            previousCropState = nil
+            currentCropState = nil
+        }
     }
     
     func cropViewDidBecomeUnResettable(_ cropView: CropViewProtocol) {
@@ -389,10 +443,20 @@ extension CropViewController: CropViewDelegate {
     }
     
     func cropViewDidBeginResize(_ cropView: CropViewProtocol) {
+        if config.enableUndoRedo {
+            previousCropState = cropView.makeCropState()
+        }
         cropToolbar.handleImageNotAutoAdjustable()
         delegate?.cropViewControllerDidBeginResize(self)
     }
     
+    func cropViewDidBeginCrop(_ cropView: CropViewProtocol) {
+        if config.enableUndoRedo {
+            previousCropState = cropView.makeCropState()
+        }
+    }
+    
+    
     func cropViewDidEndResize(_ cropView: CropViewProtocol) {
         delegate?.cropViewControllerDidEndResize(self,
                                                  original: cropView.image,
@@ -401,11 +465,38 @@ extension CropViewController: CropViewDelegate {
 }
 
 extension CropViewController: CropToolbarDelegate {
+    
+    public func didSelectUndo() {
+        undo()
+    }
+    
+    public func didSelectRedo() {
+        redo()
+    }
+    
+    public func undoActionName() -> String {
+        return _undoManager.undoActionName
+    }
+    
+    public func redoActionName() -> String {
+        return _undoManager.redoActionName
+    }
+    
+    public func isUndoSupported() -> Bool {
+        return config.enableUndoRedo
+    }
+    
     public func didSelectHorizontallyFlip(_ cropToolbar: CropToolbarProtocol? = nil) {
+        if config.enableUndoRedo {
+            previousCropState = cropView.makeCropState()
+        }
         handleHorizontallyFlip()
     }
     
     public func didSelectVerticallyFlip(_ cropToolbar: CropToolbarProtocol? = nil) {
+        if config.enableUndoRedo {
+            previousCropState = cropView.makeCropState()
+        }
         handleVerticallyFlip()
     }
     
@@ -418,10 +509,16 @@ extension CropViewController: CropToolbarDelegate {
     }
     
     public func didSelectCounterClockwiseRotate(_ cropToolbar: CropToolbarProtocol? = nil) {
+        if config.enableUndoRedo {
+            previousCropState = cropView.makeCropState()
+        }
         handleRotate(withRotateType: .counterClockwise)
     }
     
     public func didSelectClockwiseRotate(_ cropToolbar: CropToolbarProtocol? = nil) {
+        if config.enableUndoRedo {
+            previousCropState = cropView.makeCropState()
+        }
         handleRotate(withRotateType: .clockwise)
     }
     
@@ -430,14 +527,23 @@ extension CropViewController: CropToolbarDelegate {
     }
     
     public func didSelectSetRatio(_ cropToolbar: CropToolbarProtocol? = nil) {
+        if config.enableUndoRedo {
+            previousCropState = cropView.makeCropState()
+        }
         handleSetRatio()
     }
     
     public func didSelectRatio(_ cropToolbar: CropToolbarProtocol? = nil, ratio: Double) {
+        if config.enableUndoRedo {
+            previousCropState = cropView.makeCropState()
+        }
         setFixedRatio(ratio)
     }
     
     public func didSelectFreeRatio(_ cropToolbar: CropToolbarProtocol? = nil) {
+        if config.enableUndoRedo {
+            previousCropState = cropView.makeCropState()
+        }
         setFreeRatio()
     }
     
@@ -482,3 +588,64 @@ extension CropViewController {
         cropView.getExpectedCropImageSize()
     }
 }
+
+extension CropViewController: TransformDelegate {
+   
+    func updateEnableStateForUndo(_ enable: Bool) {
+        if config.enableUndoRedo {
+            delegate?.cropViewController(self, didUpdateEnableStateForUndo: enable)
+        }
+    }
+    
+    func updateEnableStateForRedo(_ enable: Bool) {
+        if config.enableUndoRedo {
+            delegate?.cropViewController(self, didUpdateEnableStateForRedo: enable)
+        }
+    }
+    
+    func updateEnableStateForReset(_ enable: Bool) {
+        if config.enableUndoRedo {
+            delegate?.cropViewController(self, didUpdateEnableStateForReset: enable)
+        }
+    }
+    
+    func getUndoManager() -> UndoManager {
+        return _undoManager
+    }
+    
+    func undo() {
+        if config.enableUndoRedo {
+            if _undoManager.canUndo {
+                _undoManager.undo()
+            }
+        }
+    }
+    
+    func redo() {
+        if config.enableUndoRedo {
+            if _undoManager.canRedo {
+                _undoManager.redo()
+            }
+        }
+    }
+    
+    func isRedoEnabled() -> Bool {
+        if config.enableUndoRedo {
+            return _undoManager.canRedo
+        } else {
+            return false
+        }
+    }
+    
+    func isUndoEnabled() -> Bool {
+        if config.enableUndoRedo {
+            return _undoManager.canUndo
+        } else {
+            return false
+        }
+    }
+    
+    func updateCropState(_ cropState: CropState) {
+        handleTransform(with: cropState)
+    }
+}
diff --git a/Sources/Mantis/Helpers/Orientation.swift b/Sources/Mantis/Helpers/Orientation.swift
index b27a2fbb..1e853512 100644
--- a/Sources/Mantis/Helpers/Orientation.swift
+++ b/Sources/Mantis/Helpers/Orientation.swift
@@ -9,7 +9,7 @@ import UIKit
 public struct Orientation {
     static var interfaceOrientation: UIInterfaceOrientation {
         if #available(iOS 13, macOS 10.13, *) {
-            return (application.windows.first?.windowScene?.interfaceOrientation)!
+            return application.windows.first?.windowScene?.interfaceOrientation ?? .portrait
         } else {
             return application.statusBarOrientation
         }
diff --git a/Sources/Mantis/Helpers/TransformRecord.swift b/Sources/Mantis/Helpers/TransformRecord.swift
new file mode 100644
index 00000000..2afa3755
--- /dev/null
+++ b/Sources/Mantis/Helpers/TransformRecord.swift
@@ -0,0 +1,88 @@
+import UIKit
+
+enum TransformType {
+    case resetTransforms
+    case transform
+}
+
+class TransformRecord: NSObject {
+    
+    private let transformType: TransformType
+    
+    private let actionName: String
+    
+    private let previousValues: [String: CropState]
+    private let currentValues: [String: CropState]
+    
+    private var useCurrent: Bool = true
+    
+    init(transformType: TransformType, actionName: String, previousValues: [String: CropState], currentValues: [String: CropState]) {
+        
+        self.transformType = transformType
+        self.actionName = actionName
+        self.previousValues = previousValues
+        self.currentValues = currentValues
+        
+        super.init()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func updateTransformState() {
+        guard let transformDelegate = TransformStack.shared.transformDelegate else { return }
+
+        guard let cropState = self.useCurrent ? self.currentValues[.kCurrentTransformState] : self.previousValues[.kCurrentTransformState] else { return }
+        
+        transformDelegate.updateCropState(cropState)
+    }
+    
+    // Add/Redo
+    @objc func addAdjustmentToStack(_ applyTransform: NSNumber? = nil) {
+        
+        guard let transformDelegate = TransformStack.shared.transformDelegate else { return }
+        
+        self.useCurrent = true
+        
+        if applyTransform?.boolValue == true {
+            updateTransformState()
+        }
+        
+        TransformStack.shared.pushTransformRecord(self)
+        
+        // register the undo event
+        transformDelegate.getUndoManager().registerUndo(withTarget: self, selector: #selector(removeAdjustmentFromStack), object: nil)
+        
+        transformDelegate.getUndoManager().setActionName(self.actionName)
+        
+        transformDelegate.updateEnableStateForReset(self.transformType != .resetTransforms)
+    }
+    
+    // Undo
+    @objc func removeAdjustmentFromStack() {
+        
+        guard let transformDelegate = TransformStack.shared.transformDelegate else { return }
+        
+        self.useCurrent = false
+        
+        self.updateTransformState()
+        
+        TransformStack.shared.popTransformStack()
+        let applyTransform = true
+        transformDelegate.getUndoManager().registerUndo(withTarget: self, selector: #selector(addAdjustmentToStack), object: NSNumber(value: applyTransform))
+        
+        transformDelegate.getUndoManager().setActionName(self.actionName)
+        
+        if self.transformType == .resetTransforms {
+            transformDelegate.updateEnableStateForReset(true)
+        } else if 0 == TransformStack.shared.top {
+            transformDelegate.updateEnableStateForReset(false)
+        }
+    }
+}
+
+extension String {
+    static let kCurrentTransformState = "CurrentTransformState"
+}
+
diff --git a/Sources/Mantis/Helpers/TransformStack.swift b/Sources/Mantis/Helpers/TransformStack.swift
new file mode 100644
index 00000000..ce3a5d95
--- /dev/null
+++ b/Sources/Mantis/Helpers/TransformStack.swift
@@ -0,0 +1,73 @@
+import UIKit
+
+
+class TransformStack: NSObject {
+    
+    static var shared: TransformStack = TransformStack()
+    
+    weak var transformDelegate : TransformDelegate?
+    
+    private var transformAdjustmentsStack: [TransformRecord] = []
+    
+    var top: Int = 0
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    private override init() {
+        super.init()
+        
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(self.undoStatusChanged(notification:)),
+            name: .NSUndoManagerCheckpoint,
+            object: nil)
+    }
+    
+    func pushTransformRecord(_ record: TransformRecord) {
+        if transformAdjustmentsStack.count > top {
+            transformAdjustmentsStack.remove(at: top)
+        }
+        transformAdjustmentsStack.insert(record, at: top)
+        top += 1
+    }
+
+    func popTransformStack() {
+        if top > 0 {
+            top -= 1
+        }
+    }
+    
+    func reset() {
+        transformAdjustmentsStack.removeAll()
+        top = 0
+    }
+    
+    @objc func undoStatusChanged(notification: NSNotification?) {
+        guard let transformDelegate = transformDelegate else { return }
+        transformDelegate.updateEnableStateForUndo(transformDelegate.isUndoEnabled())
+        transformDelegate.updateEnableStateForRedo(transformDelegate.isRedoEnabled())
+    }
+    
+    func pushTransformRecordOntoStack(transformType: TransformType, previous: CropState, current: CropState, userGenerated: Bool) {
+        if userGenerated {
+            
+            let actionString: String
+            
+            switch transformType {
+            case .transform:
+                actionString = LocalizedHelper.getString("Mantis.ChangeCrop", value: "Change Crop")
+            case .resetTransforms:
+                actionString = LocalizedHelper.getString("Mantis.ResetChanges", value: "Reset Changes")
+            }
+            
+            let previousValue:  [String: CropState] = [.kCurrentTransformState: previous]
+            let currentValue:  [String: CropState] = [.kCurrentTransformState: current]
+            
+            let transformRecord = TransformRecord(transformType: transformType, actionName: actionString, previousValues: previousValue, currentValues: currentValue)
+            
+            transformRecord.addAdjustmentToStack()
+        }
+    }
+}
diff --git a/Sources/Mantis/Mantis.swift b/Sources/Mantis/Mantis.swift
index 33926e97..26062944 100644
--- a/Sources/Mantis/Mantis.swift
+++ b/Sources/Mantis/Mantis.swift
@@ -128,7 +128,9 @@ private func buildCropWorkbenchView(with cropViewConfig: CropViewConfig, and ima
 }
 
 private func buildCropMaskViewManager(with cropViewConfig: CropViewConfig) -> CropMaskViewManagerProtocol {
+    
     let dimmingView = CropDimmingView(cropShapeType: cropViewConfig.cropShapeType)
+    
     let visualEffectView = CropMaskVisualEffectView(cropShapeType: cropViewConfig.cropShapeType,
                                                     effectType: cropViewConfig.cropMaskVisualEffectType)
     
diff --git a/Sources/Mantis/Protocols/CropToolbarProtocol.swift b/Sources/Mantis/Protocols/CropToolbarProtocol.swift
index 5ed32681..9676fa37 100644
--- a/Sources/Mantis/Protocols/CropToolbarProtocol.swift
+++ b/Sources/Mantis/Protocols/CropToolbarProtocol.swift
@@ -23,6 +23,11 @@ public protocol CropToolbarDelegate: AnyObject {
     func didSelectHorizontallyFlip(_ cropToolbar: CropToolbarProtocol?)
     func didSelectVerticallyFlip(_ cropToolbar: CropToolbarProtocol?)
     func didSelectAutoAdjust(_ cropToolbar: CropToolbarProtocol?, isActive: Bool)
+    func didSelectUndo()
+    func didSelectRedo()
+    func isUndoSupported() -> Bool
+    func undoActionName() -> String
+    func redoActionName() -> String
 }
 
 public extension CropToolbarDelegate {
diff --git a/Sources/Mantis/Protocols/CropViewControllerDelegate.swift b/Sources/Mantis/Protocols/CropViewControllerDelegate.swift
index c3dc3996..477db743 100644
--- a/Sources/Mantis/Protocols/CropViewControllerDelegate.swift
+++ b/Sources/Mantis/Protocols/CropViewControllerDelegate.swift
@@ -18,19 +18,26 @@ public protocol CropViewControllerDelegate: AnyObject {
     func cropViewControllerDidBeginResize(_ cropViewController: CropViewController)
     func cropViewControllerDidEndResize(_ cropViewController: CropViewController, original: UIImage, cropInfo: CropInfo)
     
-    @available(*, deprecated, message: "Use cropViewControllerDidImageTransformed(_ cropViewController: CropViewController, transformation: Transformation) instead")
-    func cropViewControllerDidImageTransformed(_ cropViewController: CropViewController)
-    
     func cropViewControllerDidImageTransformed(_ cropViewController: CropViewController, transformation: Transformation)
     
     func cropViewController(_ cropViewController: CropViewController, didBecomeResettable resettable: Bool)
+    
+    func cropViewController(_ cropViewController: CropViewController, didUpdateEnableStateForUndo enable: Bool)
+    
+    func cropViewController(_ cropViewController: CropViewController, didUpdateEnableStateForRedo enable: Bool)
+    
+    func cropViewController(_ cropViewController: CropViewController, didUpdateEnableStateForReset enable: Bool)
 }
 
 public extension CropViewControllerDelegate {
     func cropViewControllerDidFailToCrop(_ cropViewController: CropViewController, original: UIImage) {}
     func cropViewControllerDidBeginResize(_ cropViewController: CropViewController) {}
     func cropViewControllerDidEndResize(_ cropViewController: CropViewController, original: UIImage, cropInfo: CropInfo) {}
-    func cropViewControllerDidImageTransformed(_ cropViewController: CropViewController) {}
     func cropViewControllerDidImageTransformed(_ cropViewController: CropViewController, transformation: Transformation) {}
     func cropViewController(_ cropViewController: CropViewController, didBecomeResettable resettable: Bool) {}
+    func cropViewController(_ cropViewController: CropViewController, didUpdateEnableStateForUndo enable: Bool) {}
+    
+    func cropViewController(_ cropViewController: CropViewController, didUpdateEnableStateForRedo enable: Bool) {}
+    
+    func cropViewController(_ cropViewController: CropViewController, didUpdateEnableStateForReset enable: Bool) {}
 }
diff --git a/Sources/Mantis/Protocols/CropViewProtocol.swift b/Sources/Mantis/Protocols/CropViewProtocol.swift
index 36a3513e..82af2d71 100644
--- a/Sources/Mantis/Protocols/CropViewProtocol.swift
+++ b/Sources/Mantis/Protocols/CropViewProtocol.swift
@@ -29,7 +29,7 @@ protocol CropViewProtocol: UIView {
     func rotateBy90(withRotateType rotateType: RotateBy90DegreeType, completion: @escaping () -> Void)
     func handleAlterCropper90Degree()
     func handlePresetFixedRatio(_ ratio: Double, transformation: Transformation)
-    
+    func applyCropState(with cropState: CropState)
     func transform(byTransformInfo transformation: Transformation, isUpdateRotationControlView: Bool)
     func getTransformInfo(byTransformInfo transformInfo: Transformation) -> Transformation
     func getTransformInfo(byNormalizedInfo normalizedInfo: CGRect) -> Transformation
@@ -48,6 +48,7 @@ protocol CropViewProtocol: UIView {
     
     func rotate(by angle: Angle)
     func makeTransformation() -> Transformation
+    func makeCropState() -> CropState
 }
 
 extension CropViewProtocol {
diff --git a/Sources/Mantis/Protocols/TransformDelegate.swift b/Sources/Mantis/Protocols/TransformDelegate.swift
new file mode 100644
index 00000000..d5a6ec56
--- /dev/null
+++ b/Sources/Mantis/Protocols/TransformDelegate.swift
@@ -0,0 +1,21 @@
+//
+//  TransformDelegate.swift
+//  Mantis
+//
+//  Created by Richard Shane on 21/3/2024.
+//
+
+import Foundation
+
+protocol TransformDelegate: AnyObject {
+    func getUndoManager() -> UndoManager
+    func isUndoEnabled() -> Bool
+    func isRedoEnabled() -> Bool
+    func undo()
+    func redo()
+    func updateCropState(_ cropState: CropState)
+    func updateEnableStateForUndo(_ enable: Bool)
+    func updateEnableStateForRedo(_ enable: Bool)
+    func updateEnableStateForReset(_ enable: Bool)
+}
+
diff --git a/Sources/Mantis/Resources/ar.lproj/MantisLocalizable.strings b/Sources/Mantis/Resources/ar.lproj/MantisLocalizable.strings
index 743af1aa..60dfee1d 100644
--- a/Sources/Mantis/Resources/ar.lproj/MantisLocalizable.strings
+++ b/Sources/Mantis/Resources/ar.lproj/MantisLocalizable.strings
@@ -11,3 +11,5 @@
 "Mantis.Reset" = "إعادة تعيين";
 "Mantis.Original" = "أصلي";
 "Mantis.Square" = "مربع";
+"Mantis.ChangeCrop" = "تغيير المحاصيل";
+"Mantis.ResetChanges" = "إعادة ضبط التغييرات";
diff --git a/Sources/Mantis/Resources/de.lproj/MantisLocalizable.strings b/Sources/Mantis/Resources/de.lproj/MantisLocalizable.strings
index 3ae45688..281f09e1 100644
--- a/Sources/Mantis/Resources/de.lproj/MantisLocalizable.strings
+++ b/Sources/Mantis/Resources/de.lproj/MantisLocalizable.strings
@@ -11,4 +11,5 @@
 "Mantis.Reset" = "Zurücksetzen";
 "Mantis.Original" = "Original";
 "Mantis.Square" = "Quadrat";
-
+"Mantis.ChangeCrop" = "Zuschnitt ändern";
+"Mantis.ResetChanges" = "Änderungen zurücksetzen";
diff --git a/Sources/Mantis/Resources/en.lproj/MantisLocalizable.strings b/Sources/Mantis/Resources/en.lproj/MantisLocalizable.strings
index 1b2a493f..803d01ac 100644
--- a/Sources/Mantis/Resources/en.lproj/MantisLocalizable.strings
+++ b/Sources/Mantis/Resources/en.lproj/MantisLocalizable.strings
@@ -11,4 +11,5 @@
 "Mantis.Reset" = "Reset";
 "Mantis.Original" = "Original";
 "Mantis.Square" = "Square";
-
+"Mantis.ChangeCrop" = "Change Crop";
+"Mantis.ResetChanges" = "Reset Changes";
diff --git a/Sources/Mantis/Resources/es.lproj/MantisLocalizable.strings b/Sources/Mantis/Resources/es.lproj/MantisLocalizable.strings
index 9bdd586e..6c7f8b20 100644
--- a/Sources/Mantis/Resources/es.lproj/MantisLocalizable.strings
+++ b/Sources/Mantis/Resources/es.lproj/MantisLocalizable.strings
@@ -11,3 +11,5 @@
 "Mantis.Reset" = "Restablecer";
 "Mantis.Original" = "Original";
 "Mantis.Square" = "Cuadrada";
+"Mantis.ChangeCrop" = "Cambiar cultivo";
+"Mantis.ResetChanges" = "Restablecer cambios";
diff --git a/Sources/Mantis/Resources/fr.lproj/MantisLocalizable.strings b/Sources/Mantis/Resources/fr.lproj/MantisLocalizable.strings
index 3f1165e6..9da462f1 100644
--- a/Sources/Mantis/Resources/fr.lproj/MantisLocalizable.strings
+++ b/Sources/Mantis/Resources/fr.lproj/MantisLocalizable.strings
@@ -11,4 +11,5 @@
 "Mantis.Reset" = "Réinitialiser";
 "Mantis.Original" = "D’origine";
 "Mantis.Square" = "Carré";
-
+"Mantis.ChangeCrop" = "Changer la culture";
+"Mantis.ResetChanges" = "Réinitialiser les modifications";
diff --git a/Sources/Mantis/Resources/it.lproj/MantisLocalizable.strings b/Sources/Mantis/Resources/it.lproj/MantisLocalizable.strings
index c652c7a4..09d590be 100644
--- a/Sources/Mantis/Resources/it.lproj/MantisLocalizable.strings
+++ b/Sources/Mantis/Resources/it.lproj/MantisLocalizable.strings
@@ -11,4 +11,5 @@
 "Mantis.Reset" = "Resetta";
 "Mantis.Original" = "Originale";
 "Mantis.Square" = "Quadrato";
-
+"Mantis.ChangeCrop" = "Cambia ritaglio";
+"Mantis.ResetChanges" = "Reimposta modifiche";
diff --git a/Sources/Mantis/Resources/ja.lproj/MantisLocalizable.strings b/Sources/Mantis/Resources/ja.lproj/MantisLocalizable.strings
index 3701a3dd..4a2753bb 100644
--- a/Sources/Mantis/Resources/ja.lproj/MantisLocalizable.strings
+++ b/Sources/Mantis/Resources/ja.lproj/MantisLocalizable.strings
@@ -11,4 +11,5 @@
 "Mantis.Reset" = "リセット";
 "Mantis.Original" = "オリジナル";
 "Mantis.Square" = "正方形";
-
+"Mantis.ChangeCrop" = "クロップの変更";
+"Mantis.ResetChanges" = "変更をリセットする";
diff --git a/Sources/Mantis/Resources/ko-KR.lproj/MantisLocalizable.strings b/Sources/Mantis/Resources/ko-KR.lproj/MantisLocalizable.strings
index 1da4b936..7c6c7af3 100644
--- a/Sources/Mantis/Resources/ko-KR.lproj/MantisLocalizable.strings
+++ b/Sources/Mantis/Resources/ko-KR.lproj/MantisLocalizable.strings
@@ -11,4 +11,6 @@
 "Mantis.Reset" = "재설정";
 "Mantis.Original" = "원본";
 "Mantis.Square" = "정사각형";
+"Mantis.ChangeCrop" = "자르기 변경";
+"Mantis.ResetChanges" = "변경 사항 재설정";
 
diff --git a/Sources/Mantis/Resources/ko.lproj/MantisLocalizable.strings b/Sources/Mantis/Resources/ko.lproj/MantisLocalizable.strings
index 1da4b936..771aa0a4 100644
--- a/Sources/Mantis/Resources/ko.lproj/MantisLocalizable.strings
+++ b/Sources/Mantis/Resources/ko.lproj/MantisLocalizable.strings
@@ -11,4 +11,5 @@
 "Mantis.Reset" = "재설정";
 "Mantis.Original" = "원본";
 "Mantis.Square" = "정사각형";
-
+"Mantis.ChangeCrop" = "자르기 변경";
+"Mantis.ResetChanges" = "변경 사항 재설정";
diff --git a/Sources/Mantis/Resources/nl.lproj/MantisLocalizable.strings b/Sources/Mantis/Resources/nl.lproj/MantisLocalizable.strings
index 7815efca..918527d8 100644
--- a/Sources/Mantis/Resources/nl.lproj/MantisLocalizable.strings
+++ b/Sources/Mantis/Resources/nl.lproj/MantisLocalizable.strings
@@ -11,4 +11,5 @@
 "Mantis.Reset" = "Resetten";
 "Mantis.Original" = "Origineel";
 "Mantis.Square" = "Vierkant";
-
+"Mantis.ChangeCrop" = "Wijzig gewas";
+"Mantis.ResetChanges" = "Wijzigingen opnieuw instellen";
diff --git a/Sources/Mantis/Resources/pt-PT.lproj/MantisLocalizable.strings b/Sources/Mantis/Resources/pt-PT.lproj/MantisLocalizable.strings
index c7f64f33..739d1182 100644
--- a/Sources/Mantis/Resources/pt-PT.lproj/MantisLocalizable.strings
+++ b/Sources/Mantis/Resources/pt-PT.lproj/MantisLocalizable.strings
@@ -11,5 +11,6 @@
 "Mantis.Reset" = "Redefinir";
 "Mantis.Original" = "Original";
 "Mantis.Square" = "Quadrado";
-
+"Mantis.ChangeCrop" = "Alterar corte";
+"Mantis.ResetChanges" = "Redefinir alterações";
 
diff --git a/Sources/Mantis/Resources/ru.lproj/MantisLocalizable.strings b/Sources/Mantis/Resources/ru.lproj/MantisLocalizable.strings
index 6feda7a1..f5315cb6 100644
--- a/Sources/Mantis/Resources/ru.lproj/MantisLocalizable.strings
+++ b/Sources/Mantis/Resources/ru.lproj/MantisLocalizable.strings
@@ -11,3 +11,5 @@
 "Mantis.Reset" = "Сбросить";
 "Mantis.Original" = "Оригинал";
 "Mantis.Square" = "Квадрат";
+"Mantis.ChangeCrop" = "Изменить урожай";
+"Mantis.ResetChanges" = "Сбросить изменения";
diff --git a/Sources/Mantis/Resources/tr.lproj/MantisLocalizable.strings b/Sources/Mantis/Resources/tr.lproj/MantisLocalizable.strings
index f86da4ba..ba03027e 100644
--- a/Sources/Mantis/Resources/tr.lproj/MantisLocalizable.strings
+++ b/Sources/Mantis/Resources/tr.lproj/MantisLocalizable.strings
@@ -11,4 +11,5 @@
 "Mantis.Reset" = "Sıfırla";
 "Mantis.Original" = "Orijinal";
 "Mantis.Square" = "Kare";
-
+"Mantis.ChangeCrop" = "Kırpmayı Değiştir";
+"Mantis.ResetChanges" = "Değişiklikleri Sıfırla";
diff --git a/Sources/Mantis/Resources/zh-Hans.lproj/MantisLocalizable.strings b/Sources/Mantis/Resources/zh-Hans.lproj/MantisLocalizable.strings
index 0ae1750e..fcc55945 100644
--- a/Sources/Mantis/Resources/zh-Hans.lproj/MantisLocalizable.strings
+++ b/Sources/Mantis/Resources/zh-Hans.lproj/MantisLocalizable.strings
@@ -11,3 +11,5 @@
 "Mantis.Reset" = "重置";
 "Mantis.Original" = "原始比例";
 "Mantis.Square" = "正方形";
+"Mantis.ChangeCrop" = "调整剪裁框";
+"Mantis.ResetChanges" = "重置更改";
diff --git a/Sources/Mantis/Resources/zh-Hant.lproj/MantisLocalizable.strings b/Sources/Mantis/Resources/zh-Hant.lproj/MantisLocalizable.strings
index dea63738..bfed9d20 100644
--- a/Sources/Mantis/Resources/zh-Hant.lproj/MantisLocalizable.strings
+++ b/Sources/Mantis/Resources/zh-Hant.lproj/MantisLocalizable.strings
@@ -11,3 +11,5 @@
 "Mantis.Reset" = "重置";
 "Mantis.Original" = "原始檔";
 "Mantis.Square" = "正方形";
+"Mantis.ChangeCrop" = "調整裁剪框";
+"Mantis.ResetChanges" = "重置更改";
diff --git a/Sources/Mantis/RotationDial/RotationDial/RotationDial.swift b/Sources/Mantis/RotationDial/RotationDial/RotationDial.swift
index c7a5409d..942c3e49 100644
--- a/Sources/Mantis/RotationDial/RotationDial/RotationDial.swift
+++ b/Sources/Mantis/RotationDial/RotationDial/RotationDial.swift
@@ -194,6 +194,9 @@ extension RotationDial: RotationDialProtocol {
         guard let dialPlate = dialPlate else { return false }
         
         let radians = steppingAngle.radians
+        
+        guard radians != 0 else { return false }
+        
         if (getRotationAngle() * steppingAngle).radians >= 0 && abs(getRotationAngle().radians + radians) > angleLimit.radians {
             
             if radians > 0 {
diff --git a/Tests/MantisTests/Mock/FakeCropView.swift b/Tests/MantisTests/Mock/FakeCropView.swift
index 5fca8ed4..e4f83683 100644
--- a/Tests/MantisTests/Mock/FakeCropView.swift
+++ b/Tests/MantisTests/Mock/FakeCropView.swift
@@ -9,6 +9,21 @@ import UIKit
 @testable import Mantis
 
 class FakeCropView: UIView, CropViewProtocol {
+    func applyCropState(with cropState: Mantis.CropState) {
+        
+    }
+    
+    func makeCropState() -> Mantis.CropState {
+        return CropState(
+            rotationType: .none,
+            degrees: 0.0,
+            aspectRatioLockEnabled: false,
+            aspectRato: 0.0,
+            flipOddTimes: false,
+            transformation: makeTransformation()
+        )
+    }
+    
     var image = UIImage()
     
     var aspectRatioLockEnabled = false
@@ -63,11 +78,11 @@ class FakeCropView: UIView, CropViewProtocol {
     }
     
     func getTransformInfo(byTransformInfo transformInfo: Transformation) -> Transformation {
-        Transformation(.zero, .zero, .zero, false, .zero, .zero, .zero, false, false)
+        Transformation(offset: .zero, rotation: .zero, scale: .zero, isManuallyZoomed: false, initialMaskFrame: .zero, maskFrame: .zero, cropWorkbenchViewBounds: .zero, horizontallyFlipped: false, verticallyFlipped: false)
     }
     
     func getTransformInfo(byNormalizedInfo normalizedInfo: CGRect) -> Transformation {
-        Transformation(.zero, .zero, .zero, false, .zero, .zero, .zero, false, false)
+        Transformation(offset: .zero, rotation: .zero, scale: .zero, isManuallyZoomed: false, initialMaskFrame: .zero, maskFrame: .zero, cropWorkbenchViewBounds: .zero, horizontallyFlipped: false, verticallyFlipped: false)
     }
     
     func processPresetTransformation(completion: (Transformation) -> Void) {
@@ -87,12 +102,12 @@ class FakeCropView: UIView, CropViewProtocol {
     }
     
     func makeTransformation() -> Mantis.Transformation {
-        return Transformation(.zero, .zero, .zero, false, .zero, .zero, .zero, false, false)
+        return Transformation(offset: .zero, rotation: .zero, scale: .zero, isManuallyZoomed: false, initialMaskFrame: .zero, maskFrame: .zero, cropWorkbenchViewBounds: .zero, horizontallyFlipped: false, verticallyFlipped: false)
     }
     
     func crop() -> CropOutput {
         CropOutput(nil,
-                   Transformation(.zero, .zero, .zero, false, .zero, .zero, .zero, false, false),
+                   Transformation(offset: .zero, rotation: .zero, scale: .zero, isManuallyZoomed: false, initialMaskFrame: .zero, maskFrame: .zero, cropWorkbenchViewBounds: .zero, horizontallyFlipped: false, verticallyFlipped: false),
                    CropInfo(.zero, .zero, .zero, .zero, .zero, .zero,
                             CropRegion(topLeft: .zero,
                                        topRight: .zero,
@@ -102,7 +117,7 @@ class FakeCropView: UIView, CropViewProtocol {
     
     func crop(_ image: UIImage) -> CropOutput {
         CropOutput(nil,
-                   Transformation(.zero, .zero, .zero, false, .zero, .zero, .zero, false, false),
+                   Transformation(offset: .zero, rotation: .zero, scale: .zero, isManuallyZoomed: false, initialMaskFrame: .zero, maskFrame: .zero, cropWorkbenchViewBounds: .zero, horizontallyFlipped: false, verticallyFlipped: false),
                    CropInfo(.zero, .zero, .zero, .zero, .zero, .zero,
                             CropRegion(topLeft: .zero,
                                        topRight: .zero,
diff --git a/Tests/MantisTests/Mock/FakeCropViewControllerDelegate.swift b/Tests/MantisTests/Mock/FakeCropViewControllerDelegate.swift
index ec53097d..73feb505 100644
--- a/Tests/MantisTests/Mock/FakeCropViewControllerDelegate.swift
+++ b/Tests/MantisTests/Mock/FakeCropViewControllerDelegate.swift
@@ -36,7 +36,7 @@ class FakeCropViewControllerDelegate: CropViewControllerDelegate {
         didEndResize = true
     }
     
-    func cropViewControllerDidImageTransformed(_ cropViewController: CropViewController) {
+    func cropViewControllerDidImageTransformed(_ cropViewController: CropViewController, transformation: Transformation) {
         didImageTransformed = true
     }
 }
diff --git a/Tests/MantisTests/TransformStackTests.swift b/Tests/MantisTests/TransformStackTests.swift
new file mode 100644
index 00000000..91d7cd27
--- /dev/null
+++ b/Tests/MantisTests/TransformStackTests.swift
@@ -0,0 +1,82 @@
+//
+//  TransformStackTests.swift
+//  MantisTests
+//
+//  Created by Richard Shane on 24/3/2024.
+//
+
+import XCTest
+@testable import Mantis
+
+final class TransformStackTests: XCTestCase {
+
+    var cropVC: CropViewController!
+    var cropView: CropView!
+    var cropViewModel: CropViewModelProtocol = CropViewModel(cropViewPadding: 0, hotAreaUnit: 0)
+    
+    private func createCropView(with image: UIImage = UIImage(),
+                                cropViewConfig: CropViewConfig = CropViewConfig(),
+                                viewModel: CropViewModelProtocol) -> CropView {
+        CropView(image: image,
+                 cropViewConfig: cropViewConfig,
+                 viewModel: viewModel,
+                 cropAuxiliaryIndicatorView: FakeCropAuxiliaryIndicatorView(frame: .zero),
+                 imageContainer: FakeImageContainer(frame: .zero),
+                 cropWorkbenchView: FakeCropWorkbenchView(frame: .zero),
+                 cropMaskViewManager: FakeCropMaskViewManager())
+    }
+    
+    override func setUpWithError() throws {
+        
+        var config = Config()
+        config.enableUndoRedo = true
+        cropView = createCropView(cropViewConfig: config.cropViewConfig, viewModel: cropViewModel)
+        cropVC = CropViewController(config: config)
+        cropVC.cropView = cropView
+        
+        TransformStack.shared.transformDelegate = cropVC
+        TransformStack.shared.reset()
+        XCTAssertEqual(TransformStack.shared.top, 0)
+    }
+    
+    override func tearDownWithError() throws {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+    }
+    
+    func testApplyRecords() {
+        var previousState = cropView.makeCropState()
+        var currentState = cropView.makeCropState()
+        
+        TransformStack.shared.pushTransformRecordOntoStack(transformType: .transform, previous: previousState, current: currentState, userGenerated: true)
+        XCTAssertEqual(TransformStack.shared.top, 1)
+        
+        previousState = cropView.makeCropState()
+        currentState = cropView.makeCropState()
+        
+        TransformStack.shared.pushTransformRecordOntoStack(transformType: .resetTransforms, previous: previousState, current: currentState, userGenerated: true)
+        
+        XCTAssertEqual(TransformStack.shared.top, 2)
+        TransformStack.shared.popTransformStack()
+        XCTAssertEqual(TransformStack.shared.top, 1)
+        TransformStack.shared.popTransformStack()
+        XCTAssertEqual(TransformStack.shared.top, 0)
+        TransformStack.shared.popTransformStack()
+        XCTAssertEqual(TransformStack.shared.top, 0)
+    }
+    
+    func testExample() throws {
+        // This is an example of a functional test case.
+        // Use XCTAssert and related functions to verify your tests produce the correct results.
+        // Any test you write for XCTest can be annotated as throws and async.
+        // Mark your test throws to produce an unexpected failure when your test encounters an uncaught error.
+        // Mark your test async to allow awaiting for asynchronous code to complete. Check the results with assertions afterwards.
+    }
+
+    func testPerformanceExample() throws {
+        // This is an example of a performance test case.
+        self.measure {
+            // Put the code you want to measure the time of here.
+        }
+    }
+
+}