Merge pull request #442 from k1LoW/fix-with-freeze

fix: when slide pages are added or moved, the freeze option does not behave correctly.

Author: k1LoW

action.go

@@ -59,6 +59,13 @@ func generateActions(before, after Slides) (_ []*action, err error) {
 		return nil, fmt.Errorf("failed to adjust slide count: %w", err)
 	}
 
+	// Prevent actions from being generated from indexes that should be frozen.
+	for i, afterSlide := range adjustedAfter {
+		if afterSlide.Freeze {
+			adjustedBefore[i] = copySlide(afterSlide)
+		}
+	}
+
 	// Map slides algorithm
 	mapping, err := mapSlides(adjustedBefore, adjustedAfter)
 	if err != nil {
@@ -78,7 +85,7 @@ func generateActions(before, after Slides) (_ []*action, err error) {
 	updateActions := generateUpdateActions(adjustedBefore, adjustedAfter, mapping)
 	actions = append(actions, updateActions...)
 
-	// Remove .delete slides from after
+	// Remove delete slides from after
 	cleanedAfter := removeDeleteMarked(adjustedAfter)
 
 	// Generate delete actions

action_test.go

@@ -29,6 +29,7 @@ var tests = []struct {
 	name   string
 	before Slides
 	after  Slides
+	want   Slides // Expected result when freeze functionality is properly implemented
 }{
 	{
 		name:   "empty slides",
@@ -1608,6 +1609,96 @@ var tests = []struct {
 			},
 		},
 	},
+	{
+		name: "freeze slide moved",
+		before: Slides{
+			{
+				Layout:      "title",
+				Titles:      []string{"Slide A"},
+				TitleBodies: toBodies([]string{"Slide A"}),
+			},
+			{
+				Layout:      "title",
+				Titles:      []string{"Slide B"},
+				TitleBodies: toBodies([]string{"Slide B"}),
+			},
+			{
+				Layout:      "title",
+				Titles:      []string{"Slide C"},
+				TitleBodies: toBodies([]string{"Slide C"}),
+			},
+		},
+		after: Slides{
+			{
+				Layout:      "title",
+				Titles:      []string{"Slide A"},
+				TitleBodies: toBodies([]string{"Slide A"}),
+			},
+			{
+				Layout:      "title",
+				Titles:      []string{"Slide C"},
+				TitleBodies: toBodies([]string{"Slide C"}),
+			},
+			{
+				Layout:      "title",
+				Titles:      []string{"Slide B"},
+				TitleBodies: toBodies([]string{"Slide B"}),
+				Freeze:      true,
+			},
+		},
+		want: Slides{
+			{
+				Layout:      "title",
+				Titles:      []string{"Slide A"},
+				TitleBodies: toBodies([]string{"Slide A"}),
+			},
+			{
+				Layout:      "title",
+				Titles:      []string{"Slide C"},
+				TitleBodies: toBodies([]string{"Slide C"}),
+			},
+			{
+				Layout:      "title",
+				Titles:      []string{"Slide C"},
+				TitleBodies: toBodies([]string{"Slide C"}),
+			},
+		},
+	},
+	{
+		name: "freeze slide with append",
+		before: Slides{
+			{
+				Layout:      "title",
+				Titles:      []string{"Slide A'"},
+				TitleBodies: toBodies([]string{"Slide A'"}),
+			},
+		},
+		after: Slides{
+			{
+				Layout:      "title",
+				Titles:      []string{"Slide A"},
+				TitleBodies: toBodies([]string{"Slide A"}),
+				Freeze:      true,
+			},
+			{
+				Layout:      "title",
+				Titles:      []string{"Slide B"},
+				TitleBodies: toBodies([]string{"Slide B"}),
+			},
+		},
+		want: Slides{
+			{
+				Layout:      "title",
+				Titles:      []string{"Slide A'"},
+				TitleBodies: toBodies([]string{"Slide A'"}),
+			},
+			{
+				Layout:      "title",
+				Titles:      []string{"Slide B"},
+				TitleBodies: toBodies([]string{"Slide B"}),
+			},
+		},
+	},
 }
 
 func TestGenerateActions(t *testing.T) {
@@ -1624,7 +1715,14 @@ func TestGenerateActions(t *testing.T) {
 				t.Fatal(err)
 			}
 			got := actionsEmulator(t, tt.before, actions)
-			if diff := cmp.Diff(got, tt.after, cmpopts...); diff != "" {
+
+			// Use tt.want if provided, otherwise fallback to tt.after
+			want := tt.after
+			if tt.want != nil {
+				want = tt.want
+			}
+
+			if diff := cmp.Diff(got, want, cmpopts...); diff != "" {
 				t.Error(diff)
 			}
 		})

integration_apply_test.go

@@ -56,7 +56,14 @@ func TestApply(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			if diff := cmp.Diff(after, tt.after, cmpopts...); diff != "" {
+
+			// Use tt.want if provided, otherwise fallback to tt.after
+			want := tt.after
+			if tt.want != nil {
+				want = tt.want
+			}
+
+			if diff := cmp.Diff(after, want, cmpopts...); diff != "" {
 				t.Error(diff)
 			}
 		})