Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Divyesh/feature/support undo redo #86

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Divyesh/feature/support undo redo #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
00a402c
Fixed unwanted view update on selection change
cp-divyesh-v Jan 8, 2025
63e1f54
Suporting undo for toggle style
cp-divyesh-v Jan 9, 2025
a9319e0
Fix undo redo for header, font and alignment
cp-divyesh-v Jan 10, 2025
bc7b8a9
Fix redo and undo for color attrubutes
cp-divyesh-v Jan 13, 2025
448205a
Fixed overlaping style will gnerate duplicate and incorect span
cp-divyesh-v Jan 13, 2025
ae1e218
Fix color undo and redo
cp-divyesh-v Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ repos:
name: Swift Format
description: Enforces formatting guidelines for Swift files before committing.
language: system
entry: swiftformat --swiftversion 5
entry: swiftformat --swiftversion 5.9
stages:
- pre-commit

Expand Down
330 changes: 165 additions & 165 deletions RichEditorDemo/RichEditorDemo/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,183 +9,183 @@ import RichEditorSwiftUI
import SwiftUI

struct ContentView: View {
@Environment(\.colorScheme) var colorScheme

@ObservedObject var state: RichEditorState
@State private var isInspectorPresented = false
@State private var fileName: String = ""
@State private var exportFormat: RichTextDataFormat? = nil
@State private var otherExportFormat: RichTextExportOption? = nil
@State private var exportService: StandardRichTextExportService = .init()

init(state: RichEditorState? = nil) {
if let state {
self.state = state
} else {
if let richText = readJSONFromFile(
fileName: "Sample_json",
type: RichText.self)
{
self.state = .init(richText: richText)
} else {
self.state = .init(input: "Hello World!")
}
}
@Environment(\.colorScheme) var colorScheme

@ObservedObject var state: RichEditorState
@State private var isInspectorPresented = false
@State private var fileName: String = ""
@State private var exportFormat: RichTextDataFormat? = nil
@State private var otherExportFormat: RichTextExportOption? = nil
@State private var exportService: StandardRichTextExportService = .init()

init(state: RichEditorState? = nil) {
if let state {
self.state = state
} else {
if let richText = readJSONFromFile(
fileName: "Sample_json",
type: RichText.self)
{
self.state = .init(richText: richText)
} else {
self.state = .init(input: "Hello World!")
}
}
}

var body: some View {
NavigationStack {
VStack {
#if os(macOS)
RichTextFormat.Toolbar(context: state)
#endif

RichTextEditor(
context: _state,
viewConfiguration: { _ in

}
)
.background(
colorScheme == .dark ? .gray.opacity(0.3) : Color.white
)
.cornerRadius(10)

#if os(iOS)
RichTextKeyboardToolbar(
context: state,
leadingButtons: { $0 },
trailingButtons: { $0 },
formatSheet: { $0 }
)
#endif
}
#if os(iOS) || os(macOS)
.inspector(isPresented: $isInspectorPresented) {
RichTextFormat.Sidebar(context: state)
#if os(macOS)
.inspectorColumnWidth(
min: 200, ideal: 200, max: 315)
#endif
}
#endif
.padding(10)
#if os(iOS) || os(macOS)
.toolbar {
ToolbarItemGroup(placement: .automatic) {
toolBarGroup
}
}
#endif
.background(colorScheme == .dark ? .black : .gray.opacity(0.07))
.navigationTitle("Rich Editor")
.alert("Enter file name", isPresented: getBindingAlert()) {
TextField("Enter file name", text: $fileName)
Button("OK", action: submit)
} message: {
Text("Please enter file name")
}
.focusedValue(\.richEditorState, state)
.toolbarRole(.automatic)
#if os(iOS) || os(macOS) || os(visionOS)
.richTextFormatSheetConfig(.init(colorPickers: colorPickers))
.richTextFormatSidebarConfig(
.init(
colorPickers: colorPickers,
fontPicker: isMac
)
)
.richTextFormatToolbarConfig(.init(colorPickers: []))
var body: some View {
NavigationStack {
VStack {
#if os(macOS)
RichTextFormat.Toolbar(context: state)
#endif

RichTextEditor(
context: _state,
viewConfiguration: { _ in

}
)
.background(
colorScheme == .dark ? .gray.opacity(0.3) : Color.white
)
.cornerRadius(10)

#if os(iOS)
RichTextKeyboardToolbar(
context: state,
leadingButtons: { $0 },
trailingButtons: { $0 },
formatSheet: { $0 }
)
#endif
}
#if os(iOS) || os(macOS)
.inspector(isPresented: $isInspectorPresented) {
RichTextFormat.Sidebar(context: state)
#if os(macOS)
.inspectorColumnWidth(
min: 200, ideal: 200, max: 315)
#endif
}
}

#if os(iOS) || os(macOS)
var toolBarGroup: some View {
return Group {
RichTextExportMenu.init(
formatAction: { format in
exportFormat = format
},
otherOptionAction: { format in
otherExportFormat = format
}
)
#if !os(macOS)
.frame(width: 25, alignment: .center)
#endif
Button(
action: {
print("Exported JSON == \(state.outputAsString())")
},
label: {
Image(systemName: "printer.inverse")
}
)
#if !os(macOS)
.frame(width: 25, alignment: .center)
#endif
Toggle(isOn: $isInspectorPresented) {
Image.richTextFormatBrush
.resizable()
.aspectRatio(1, contentMode: .fit)
}
#if !os(macOS)
.frame(width: 25, alignment: .center)
#endif
}
#endif
.padding(10)
#if os(iOS) || os(macOS)
.toolbar {
ToolbarItemGroup(placement: .automatic) {
toolBarGroup
}
}
#endif

func getBindingAlert() -> Binding<Bool> {
.init(
get: { exportFormat != nil || otherExportFormat != nil },
set: { newValue in
exportFormat = nil
otherExportFormat = nil
})
#endif
.background(colorScheme == .dark ? .black : .gray.opacity(0.07))
.navigationTitle("Rich Editor")
.alert("Enter file name", isPresented: getBindingAlert()) {
TextField("Enter file name", text: $fileName)
Button("OK", action: submit)
} message: {
Text("Please enter file name")
}
.focusedValue(\.richEditorState, state)
.toolbarRole(.automatic)
#if os(iOS) || os(macOS) || os(visionOS)
.richTextFormatSheetConfig(.init(colorPickers: colorPickers))
.richTextFormatSidebarConfig(
.init(
colorPickers: colorPickers,
fontPicker: isMac
)
)
.richTextFormatToolbarConfig(.init(colorPickers: []))
#endif
}

func submit() {
guard !fileName.isEmpty else { return }
var path: URL?

if let exportFormat {
path = try? exportService.generateExportFile(
withName: fileName, content: state.attributedString,
format: exportFormat)
}
if let otherExportFormat {
switch otherExportFormat {
case .pdf:
path = try? exportService.generatePdfExportFile(
withName: fileName, content: state.attributedString)
case .json:
path = try? exportService.generateJsonExportFile(
withName: fileName, content: state.richText)
}
}
if let path {
print("Exported at path == \(path)")
}

#if os(iOS) || os(macOS)
var toolBarGroup: some View {
return Group {
RichTextExportMenu.init(
formatAction: { format in
exportFormat = format
},
otherOptionAction: { format in
otherExportFormat = format
}
)
#if !os(macOS)
.frame(width: 25, alignment: .center)
#endif
Button(
action: {
print("Exported JSON == \(state.outputAsString())")
},
label: {
Image(systemName: "printer.inverse")
}
)
#if !os(macOS)
.frame(width: 25, alignment: .center)
#endif
Toggle(isOn: $isInspectorPresented) {
Image.richTextFormatBrush
.resizable()
.aspectRatio(1, contentMode: .fit)
}
#if !os(macOS)
.frame(width: 25, alignment: .center)
#endif
}
}
#endif

func getBindingAlert() -> Binding<Bool> {
.init(
get: { exportFormat != nil || otherExportFormat != nil },
set: { newValue in
exportFormat = nil
otherExportFormat = nil
})
}

func submit() {
guard !fileName.isEmpty else { return }
var path: URL?

if let exportFormat {
path = try? exportService.generateExportFile(
withName: fileName, content: state.attributedString,
format: exportFormat)
}
if let otherExportFormat {
switch otherExportFormat {
case .pdf:
path = try? exportService.generatePdfExportFile(
withName: fileName, content: state.attributedString)
case .json:
path = try? exportService.generateJsonExportFile(
withName: fileName, content: state.richText)
}
}
if let path {
print("Exported at path == \(path)")
}
}
}

extension ContentView {

var isMac: Bool {
#if os(macOS)
true
#else
false
#endif
}
var isMac: Bool {
#if os(macOS)
true
#else
false
#endif
}

var colorPickers: [RichTextColor] {
[.foreground, .background]
}
var colorPickers: [RichTextColor] {
[.foreground, .background]
}

var formatToolbarEdge: VerticalEdge {
isMac ? .top : .bottom
}
var formatToolbarEdge: VerticalEdge {
isMac ? .top : .bottom
}
}
Loading