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.

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

Update protocol to support multi-user undo and redo on Text.edit #644

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 41 additions & 0 deletions api/converter/from_pb.go
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,8 @@ func FromOperations(pbOps []*api.Operation) ([]operations.Operation, error) {
op, err = fromRemove(decoded.Remove)
case *api.Operation_Edit_:
op, err = fromEdit(decoded.Edit)
case *api.Operation_EditReverse_:
op, err = fromEditReverse(decoded.EditReverse)
case *api.Operation_Style_:
op, err = fromStyle(decoded.Style)
case *api.Operation_Select_:
Expand Down Expand Up @@ -427,6 +429,45 @@ func fromEdit(pbEdit *api.Operation_Edit) (*operations.Edit, error) {
), nil
}

func fromEditReverse(pbEditReverse *api.Operation_EditReverse) (*operations.EditReverse, error) {
parentCreatedAt, err := fromTimeTicket(pbEditReverse.ParentCreatedAt)
if err != nil {
return nil, err
}

var deletedIDs []*crdt.RGATreeSplitNodePos
pbDeletedIDs := pbEditReverse.GetDeletedIds()
for _, pbDeletedID := range pbDeletedIDs {
deletedID, err := fromTextNodePos(pbDeletedID)
if err != nil {
return nil, err
}
deletedIDs = append(deletedIDs, deletedID)
}

var insertedIDs []*crdt.RGATreeSplitNodePos
pbInsertedIDs := pbEditReverse.GetInsertedIds()
for _, pbInsertedID := range pbInsertedIDs {
insertedID, err := fromTextNodePos(pbInsertedID)
if err != nil {
return nil, err
}
insertedIDs = append(insertedIDs, insertedID)
}

executedAt, err := fromTimeTicket(pbEditReverse.ExecutedAt)
if err != nil {
return nil, err
}
return operations.NewEditReverse(
parentCreatedAt,
deletedIDs,
insertedIDs,
pbEditReverse.Attributes,
executedAt,
), nil
}

func fromStyle(pbStyle *api.Operation_Style) (*operations.Style, error) {
parentCreatedAt, err := fromTimeTicket(pbStyle.ParentCreatedAt)
if err != nil {
Expand Down
26 changes: 26 additions & 0 deletions api/converter/to_pb.go
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,8 @@ func ToOperations(ops []operations.Operation) ([]*api.Operation, error) {
pbOperation.Body, err = toRemove(op)
case *operations.Edit:
pbOperation.Body, err = toEdit(op)
case *operations.EditReverse:
pbOperation.Body, err = toEditReverse(op)
case *operations.Style:
pbOperation.Body, err = toStyle(op)
case *operations.Increase:
Expand Down Expand Up @@ -351,6 +353,30 @@ func toEdit(e *operations.Edit) (*api.Operation_Edit_, error) {
}, nil
}

func toEditReverse(e *operations.EditReverse) (*api.Operation_EditReverse_, error) {
var pbDeletedIDs []*api.TextNodePos
deletedIDs := e.DeletedIDs()
for _, deletedID := range deletedIDs {
pbDeletedIDs = append(pbDeletedIDs, toTextNodePos(deletedID))
}

var pbInsertedIDs []*api.TextNodePos
insertedIDs := e.InsertedIDs()
for _, insertedID := range insertedIDs {
pbInsertedIDs = append(pbInsertedIDs, toTextNodePos(insertedID))
}

return &api.Operation_EditReverse_{
EditReverse: &api.Operation_EditReverse{
ParentCreatedAt: ToTimeTicket(e.ParentCreatedAt()),
DeletedIds: pbDeletedIDs,
InsertedIds: pbInsertedIDs,
Attributes: e.Attributes(),
ExecutedAt: ToTimeTicket(e.ExecutedAt()),
},
}, nil
}

func toStyle(style *operations.Style) (*api.Operation_Style_, error) {
return &api.Operation_Style_{
Style: &api.Operation_Style{
Expand Down
Loading