Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Aug 5, 2025. It is now read-only.

Commit67dfa0c

Browse files
authored
possible tweaks (#192)
1 parentb6c293e commit67dfa0c

File tree

2 files changed

+74
-75
lines changed

2 files changed

+74
-75
lines changed

‎src/routes/tutorial/[slug]/filetree/File.svelte‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
99
const {rename,remove,readonly }=context.get();
1010
11-
/**@type{'idle' | 'renaming'}*/
12-
let editing_state='idle';
11+
let renaming=false;
1312
1413
$: can_remove=!$readonly&&!$solution[file.name];
1514
@@ -20,7 +19,7 @@
2019
icon:'rename',
2120
label:'Rename',
2221
fn: ()=> {
23-
editing_state='renaming';
22+
renaming=true;
2423
}
2524
},
2625
{
@@ -37,18 +36,18 @@
3736
<divclass="row"class:selected={file.name===$selected?.name}>
3837
<Item
3938
can_rename={can_remove}
40-
renaming={editing_state==='renaming'}
39+
{renaming}
4140
basename={file.basename}
4241
{actions}
4342
on:click={()=>state.select_file(file.name)}
4443
on:edit={()=> {
45-
editing_state='renaming';
44+
renaming=true;
4645
}}
4746
on:rename={(e)=> {
4847
rename(file,e.detail.basename);
4948
}}
5049
on:cancel={()=> {
51-
editing_state='idle';
50+
renaming=false;
5251
}}
5352
/>
5453
</div>

‎src/routes/tutorial/[slug]/state.js‎

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { derived, writable } from 'svelte/store';
1818
/**
1919
*@type {import('svelte/store').Writable<State>}
2020
*/
21-
const_state=writable({
21+
const{ subscribe, set, update}=writable({
2222
status:'initial',
2323
stubs:[],
2424
selected:null,
@@ -34,100 +34,100 @@ const _state = writable({
3434
});
3535

3636
exportconststate={
37-
subscribe:_state.subscribe,
37+
subscribe,
38+
3839
/**@param {import('$lib/types').FileStub} file */
3940
update_file:(file)=>{
40-
_state.update((state)=>{
41-
state.status='update';
42-
state.stubs=state.stubs.map((stub)=>{
41+
update((state)=>({
42+
...state,
43+
status:'update',
44+
stubs:state.stubs.map((stub)=>{
4345
if(stub.name===file.name){
4446
returnfile;
4547
}
4648
returnstub;
47-
});
48-
state.last_updated=file;
49-
returnstate;
50-
});
49+
}),
50+
last_updated:file
51+
}));
5152
},
53+
5254
/**@param {import('$lib/types').Stub[]} [stubs] */
5355
set_stubs:(stubs)=>{
54-
_state.update((state)=>{
55-
state.status='set';
56-
state.stubs=stubs||state.stubs;
57-
state.last_updated=undefined;
58-
returnstate;
59-
});
56+
update((state)=>({
57+
...state,
58+
status:'set',
59+
stubs:stubs??state.stubs,
60+
last_updated:undefined
61+
}));
6062
},
63+
6164
/**@param {import('$lib/types').Exercise} exercise */
6265
switch_exercise:(exercise)=>{
63-
_state.update((state)=>{
64-
constsolution={ ...exercise.a};
65-
constediting_constraints={
66-
create:exercise.editing_constraints.create,
67-
remove:exercise.editing_constraints.remove
68-
};
69-
70-
// TODO should exercise.a/b be an array in the first place?
71-
for(conststubofObject.values(exercise.b)){
72-
if(stub.type==='file'&&stub.contents.startsWith('__delete')){
73-
// remove file
74-
if(!editing_constraints.remove.includes(stub.name)){
75-
editing_constraints.remove.push(stub.name);
76-
}
77-
deletesolution[stub.name];
78-
}elseif(stub.name.endsWith('/__delete')){
79-
// remove directory
80-
constparent=stub.name.slice(0,stub.name.lastIndexOf('/'));
81-
if(!editing_constraints.remove.includes(parent)){
82-
editing_constraints.remove.push(parent);
83-
}
84-
deletesolution[parent];
85-
for(constkinsolution){
86-
if(k.startsWith(parent+'/')){
87-
deletesolution[k];
88-
}
89-
}
90-
}else{
91-
if(!solution[stub.name]&&!editing_constraints.create.includes(stub.name)){
92-
editing_constraints.create.push(stub.name);
66+
constsolution={ ...exercise.a};
67+
constediting_constraints={
68+
create:exercise.editing_constraints.create,
69+
remove:exercise.editing_constraints.remove
70+
};
71+
72+
// TODO should exercise.a/b be an array in the first place?
73+
for(conststubofObject.values(exercise.b)){
74+
if(stub.type==='file'&&stub.contents.startsWith('__delete')){
75+
// remove file
76+
if(!editing_constraints.remove.includes(stub.name)){
77+
editing_constraints.remove.push(stub.name);
78+
}
79+
deletesolution[stub.name];
80+
}elseif(stub.name.endsWith('/__delete')){
81+
// remove directory
82+
constparent=stub.name.slice(0,stub.name.lastIndexOf('/'));
83+
if(!editing_constraints.remove.includes(parent)){
84+
editing_constraints.remove.push(parent);
85+
}
86+
deletesolution[parent];
87+
for(constkinsolution){
88+
if(k.startsWith(parent+'/')){
89+
deletesolution[k];
9390
}
94-
solution[stub.name]=exercise.b[stub.name];
9591
}
92+
}else{
93+
if(!solution[stub.name]&&!editing_constraints.create.includes(stub.name)){
94+
editing_constraints.create.push(stub.name);
95+
}
96+
solution[stub.name]=exercise.b[stub.name];
9697
}
98+
}
9799

98-
state.status='switch';
99-
state.stubs=Object.values(exercise.a);
100-
state.exercise={
100+
set({
101+
status:'switch',
102+
stubs:Object.values(exercise.a),
103+
exercise:{
101104
initial:Object.values(exercise.a),
102105
solution,
103106
editing_constraints,
104107
scope:exercise.scope
105-
};
106-
state.last_updated=undefined;
107-
state.selected=exercise.focus;
108-
returnstate;
108+
},
109+
last_updated:undefined,
110+
selected:exercise.focus
109111
});
110112
},
113+
111114
toggle_completion:()=>{
112-
_state.update((state)=>{
113-
if(is_completed(state)){
114-
state.stubs=state.exercise.initial;
115-
}else{
116-
state.stubs=Object.values(state.exercise.solution);
117-
}
118-
state.status='set';
119-
state.last_updated=undefined;
120-
returnstate;
121-
});
115+
update((state)=>({
116+
...state,
117+
status:'set',
118+
stubs:is_completed(state) ?state.exercise.initial :Object.values(state.exercise.solution),
119+
last_updated:undefined
120+
}));
122121
},
122+
123123
/**@param {string | null} name */
124124
select_file:(name)=>{
125-
_state.update((state)=>{
126-
state.status='select';
127-
state.selected=name;
128-
state.last_updated=undefined;
129-
returnstate;
130-
});
125+
update((state)=>({
126+
...state,
127+
status:'select',
128+
selected:name,
129+
last_updated:undefined
130+
}));
131131
}
132132
};
133133

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp