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

Jump to bottom

feat: add storage for canvas #6399

Merged
merged 9 commits into from
Aug 9, 2023
Merged

feat: add storage for canvas #6399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4b4124a
feat: add storage for canvas
answershuto Jul 19, 2023
e7ca35b
feat: add changeset
answershuto Jul 19, 2023
3763131
feat: add storage for script
answershuto Jul 19, 2023
d0836d6
feat: add set value
answershuto Jul 24, 2023
4394a5c
feat: modify userKVStorage
answershuto Aug 2, 2023
b04ef65
feat: modify getItem
answershuto Aug 2, 2023
0edc4bd
feat: add bizID
answershuto Aug 2, 2023
b6c5772
chore: add @ice/runtime to dev dependencied
answershuto Aug 9, 2023
4a6af19
Merge branch 'release/next' into feat/add_storage
answershuto Aug 9, 2023
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
5 changes: 5 additions & 0 deletions .changeset/smooth-guests-count.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@ice/cache-canvas': patch
---

feat: add storage for canvas
4 changes: 3 additions & 1 deletion examples/cavans-project/src/pages/home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,15 @@ export default function Home() {
setTimeout(() => {
console.log('canvas paint ready!');
resolve(true);
}, 5000);
}, 10000);
});
};

return (
<>
<h2 className={styles.title}>Home Page</h2>
<CacheCanvas
bizID={'test'}
ref={childRef}
id={GAME_CANVAS_ID}
init={initFunc}
Expand Down
40 changes: 34 additions & 6 deletions packages/cache-canvas/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ declare global {
call: Function;
};
_windvane_backControl: Function | null;
__megability_bridge__: {
syncCall: Function;
};
}
}

Expand All @@ -33,6 +36,7 @@ export type RefCacheCanvas = {

export type CacheCanvasProps = {
id: string;
bizID: string;
init: () => Promise<any>;
useCache?: Boolean;
getSnapshot?: () => String;
Expand All @@ -50,6 +54,7 @@ export const CacheCanvas = forwardRef((props: CacheCanvasProps, ref) => {
fallback,
style,
className,
bizID = '',
...rest
} = props;

Expand All @@ -69,9 +74,11 @@ export const CacheCanvas = forwardRef((props: CacheCanvasProps, ref) => {
}
// Cache base64 string when canvas rendered.
if (renderedCanvas && strBase64) {
Storage.setItem(cacheKey, strBase64);
Storage.setItem(cacheKey, strBase64, {
bizID,
});
}
}, [id, renderedCanvas, cacheKey, getSnapshot]);
}, [id, renderedCanvas, cacheKey, getSnapshot, bizID]);

useImperativeHandle(ref, () => ({
cacheCanvasToStorage: cacheCanvasFunc,
Expand Down Expand Up @@ -126,13 +133,13 @@ export const CacheCanvas = forwardRef((props: CacheCanvasProps, ref) => {
<img
className={className}
style={style}
src={Storage.getItem(cacheKey) || ''}
src={Storage.getItem(cacheKey, { bizID }) || ''}
answershuto marked this conversation as resolved.
Show resolved Hide resolved
id={`canvas-img-${id}`}
/>
{
(typeof fallback === 'function') && (<div
id={`fallback-${id}`}
style={isNode || Storage.getItem(cacheKey) ? { display: 'none' } : { display: 'block' }}
style={isNode || Storage.getItem(cacheKey, { bizID }) ? { display: 'none' } : { display: 'block' }}
>
{
fallback()
Expand All @@ -141,8 +148,29 @@ export const CacheCanvas = forwardRef((props: CacheCanvasProps, ref) => {
}
<script
dangerouslySetInnerHTML={{
__html: `
const base64Data = localStorage.getItem('${cacheKey}');
__html: `
let base64Data = '';
if (
window.__megability_bridge__ &&
window.__megability_bridge__.syncCall
) {
const canIUse = window.__megability_bridge__.syncCall('ability', 'available', {
ability: 'userKVStorage',
api: 'getItem',
});

if (canIUse) {
const res = window.__megability_bridge__.syncCall('userKVStorage', 'getItem', { key: '${cacheKey}', bizID: '${bizID}' });
if (res && res.statusCode === 0 && res.data && res.data.result) {
base64Data = res.data.result;
}
}
}

if (!base64Data) {
base64Data = localStorage.getItem(${JSON.stringify(cacheKey)});
}

const fallback = document.getElementById('fallback-${id}');
if (base64Data) {
const img = document.getElementById('canvas-img-${id}');
Expand Down
54 changes: 50 additions & 4 deletions packages/cache-canvas/src/storage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,31 @@
const cache = {};

export const Storage = {
setItem: (key, value) => {
setItem: (key, value, { bizID = '' }) => {
try {
if (typeof window === 'object' && window.localStorage) {
if (
typeof window !== 'undefined' &&
window.__megability_bridge__ &&
window.__megability_bridge__.syncCall
) {
const canIUse = window.__megability_bridge__.syncCall('ability', 'available', {
ability: 'userKVStorage',
api: 'setItem',
});

if (canIUse) {
const res = window.__megability_bridge__.syncCall('userKVStorage', 'setItem', {
key,
value,
bizID,
});
if (res && res.statusCode === 0) {
return;
}
}
}

if (typeof window !== 'undefined' && window.localStorage) {
return localStorage.setItem(key, value);
}

Expand All @@ -12,9 +34,33 @@ export const Storage = {
console.error('Storage setItem error:', e);
}
},
getItem: (key) => {
getItem: (key, { bizID = '' }) => {
try {
if (typeof window === 'object' && window.localStorage) {
if (
typeof window !== 'undefined' &&
window.__megability_bridge__ &&
window.__megability_bridge__.syncCall
) {
const canIUse = window.__megability_bridge__.syncCall('ability', 'available', {
ability: 'userKVStorage',
api: 'getItem',
});

if (canIUse) {
const res = window.__megability_bridge__.syncCall(
'userKVStorage',
'getItem',
{
key,
bizID,
});
if (res && res.statusCode === 0 && res.data && res.data.result) {
return res.data.result;
}
}
}

if (typeof window !== 'undefined' && window.localStorage) {
return localStorage.getItem(key);
}

Expand Down
3 changes: 2 additions & 1 deletion packages/plugin-cavans/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
},
"devDependencies": {
"@ice/app": "^3.2.8",
"webpack": "^5.86.0"
"webpack": "^5.86.0",
"@ice/runtime": "^1.2.5"
},
"repository": {
"type": "http",
Expand Down
Loading