Commit a1d2e9dd authored by sliao's avatar sliao

fix

parent b3623798
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
}, },
"dependencies": { "dependencies": {
"@ray-js/build-plugin-router": "^0.6.15", "@ray-js/build-plugin-router": "^0.6.15",
"@ray-js/components-ty-lamp": "^1.3.0",
"@ray-js/panel-sdk": "^1.2.1", "@ray-js/panel-sdk": "^1.2.1",
"@ray-js/ray": "^0.6.13", "@ray-js/ray": "^0.6.13",
"ahooks": "^3.7.1", "ahooks": "^3.7.1",
......
...@@ -6,12 +6,13 @@ ...@@ -6,12 +6,13 @@
height: 424px; height: 424px;
background-color: white; background-color: white;
border-radius: 24px; border-radius: 24px;
align-items: center;
// position: absolute; // position: absolute;
// top: calc(50vh - 175px); // top: calc(50vh - 175px);
margin-top: 90px; margin-top: 90px;
padding: 0 0 40px; padding: 0 0 40px;
color: #000000; color: #000000;
z-index: 9999; z-index: 99999;
} }
.lightModalTop { .lightModalTop {
display: flex; display: flex;
...@@ -50,6 +51,7 @@ ...@@ -50,6 +51,7 @@
display: flex; display: flex;
// align-items: center; // align-items: center;
justify-content: center; justify-content: center;
overflow: hidden;
} }
.moveCircle { .moveCircle {
...@@ -74,6 +76,7 @@ ...@@ -74,6 +76,7 @@
position: relative; position: relative;
overflow: hidden; overflow: hidden;
margin: 0 3px; margin: 0 3px;
width: 336px;
} }
.progressSun { .progressSun {
width: 21px; width: 21px;
......
...@@ -9,7 +9,8 @@ import { Image, View } from '@ray-js/components'; ...@@ -9,7 +9,8 @@ import { Image, View } from '@ray-js/components';
import iconClose from '../../../public/icon-close.png'; import iconClose from '../../../public/icon-close.png';
import iconLightWhite from '../../../public/icon-light-white.png'; import iconLightWhite from '../../../public/icon-light-white.png';
import iconSun from '../../../public/icon-sun.png'; import iconSun from '../../../public/icon-sun.png';
// import { usePageEvent } from '@ray-js/ray'; import { LampRectWhitePicker } from '@ray-js/components-ty-lamp';
import { usePageEvent } from '@ray-js/ray';
export interface Props { export interface Props {
isShow: boolean; isShow: boolean;
setModal: (boolean) => void; setModal: (boolean) => void;
...@@ -30,11 +31,7 @@ export const LightPanel = React.memo<Props>(props => { ...@@ -30,11 +31,7 @@ export const LightPanel = React.memo<Props>(props => {
return percent; return percent;
}); });
const temperatureVal = useSdmProps(dpState => { const temperatureVal = useSdmProps(dpState => dpState[temperatureCode]);
const val = dpState[temperatureCode];
const originX = getOrignPointX(val);
return originX;
});
const switchVal = useSdmProps(dpState => dpState[switchCode]); const switchVal = useSdmProps(dpState => dpState[switchCode]);
const device = devices.fan; const device = devices.fan;
...@@ -43,9 +40,27 @@ export const LightPanel = React.memo<Props>(props => { ...@@ -43,9 +40,27 @@ export const LightPanel = React.memo<Props>(props => {
const brightAction = actions[brightCode] as DpCommonAction<number>; const brightAction = actions[brightCode] as DpCommonAction<number>;
const temperatureAction = actions[temperatureCode] as DpCommonAction<number>; const temperatureAction = actions[temperatureCode] as DpCommonAction<number>;
const [point, setPoint] = useState({ pageX: temperatureVal, pageY: 250 }); // const [point, setPoint] = useState({ pageX: temperatureVal, pageY: 250 });
const [brightPercent, setBrightPercent] = useState(brightVal); const [brightPercent, setBrightPercent] = useState(brightVal);
const [temperature, setTemp] = useState(temperatureVal);
// useEffect(() => {
// if (temperatureVal !== temperature) {
// setTemp(temperatureVal)
// }
// })
// const handleMove = (v: number) => {
// setTemp(v);
// };
// const handleEnd = (v: number) => {
// setTemp(v);
// };
usePageEvent('onShow', () => {
console.log('light panel');
setTemp(temperatureVal)
})
useEffect(() => { useEffect(() => {
if (brightVal !== brightPercent) { if (brightVal !== brightPercent) {
setBrightPercent(brightVal); setBrightPercent(brightVal);
...@@ -58,12 +73,12 @@ export const LightPanel = React.memo<Props>(props => { ...@@ -58,12 +73,12 @@ export const LightPanel = React.memo<Props>(props => {
// } // }
// }, [temperatureVal]) // }, [temperatureVal])
function getOrignPointX(val = temperatureVal) { // function getOrignPointX(val = temperatureVal) {
const percent = getValueInRange(val || 10, cctRange).percent; // const percent = getValueInRange(val || 10, cctRange).percent;
const originX = 28 + 319 * (percent / 100); // const originX = 28 + 319 * (percent / 100);
console.log(val, percent, originX); // console.log(val, percent, originX);
return originX; // return originX;
} // }
//0-value是值 1-value是百分比 左边最小值是0,右边最大值range[1],起始位置rang[0] //0-value是值 1-value是百分比 左边最小值是0,右边最大值range[1],起始位置rang[0]
function getValueInRange(value, range, type = 0) { function getValueInRange(value, range, type = 0) {
const percent = type == 0 ? value / range[1] : value / 100; const percent = type == 0 ? value / range[1] : value / 100;
...@@ -73,50 +88,48 @@ export const LightPanel = React.memo<Props>(props => { ...@@ -73,50 +88,48 @@ export const LightPanel = React.memo<Props>(props => {
}; };
} }
// function touchStart(e) {
// // e.origin.stopPropagation();
function touchStart(e) { // // handlePoint(e);
// e.origin.stopPropagation(); // }
// handlePoint(e);
}
function handleTouch(e) { // function handleTouch(e) {
// e.origin.stopPropagation(); // // e.origin.stopPropagation();
handlePoint(e, false); // handlePoint(e, false);
} // }
function touchEnd(e) { // function touchEnd(e) {
console.log(e, 'touchEnd'); // console.log(e, 'touchEnd');
handlePoint(e); // handlePoint(e);
} // }
function handlePoint(e, isAction = true) { // function handlePoint(e, isAction = true) {
const { pageX, pageY } = e.changedTouches.length && e.changedTouches[0]; // const { pageX, pageY } = e.changedTouches.length && e.changedTouches[0];
let x = pageX; // let x = pageX;
let y = pageY; // let y = pageY;
const xRange = [28, 347]; // const xRange = [28, 347];
if (pageX < xRange[0]) { // if (pageX < xRange[0]) {
x = xRange[0]; // x = xRange[0];
} // }
if (pageX > xRange[1]) { // if (pageX > xRange[1]) {
x = xRange[1]; // x = xRange[1];
} // }
if (pageY < 197) { // if (pageY < 197) {
y = 197; // y = 197;
} // }
if (pageY > 320) { // if (pageY > 320) {
y = 320; // y = 320;
} // }
setPoint({ pageX: x, pageY: y }); // setPoint({ pageX: x, pageY: y });
console.log(x, y, 'xxxxxxyyyyyyyy'); // console.log(x, y, 'xxxxxxyyyyyyyy');
const percent = (x - xRange[0]) / (xRange[1] - xRange[0]); // const percent = (x - xRange[0]) / (xRange[1] - xRange[0]);
const value = Number((cctRange[1] * percent).toFixed()); // const value = Number((cctRange[1] * percent).toFixed());
// setColor(pointToRGB(x)); // // setColor(pointToRGB(x));
if (isAction) { // if (isAction) {
temperatureAction.set(value); // temperatureAction.set(value);
} // }
} // }
// function pointToRGB(pageX) { // function pointToRGB(pageX) {
// const half = (347 - 28) / 2; // const half = (347 - 28) / 2;
...@@ -166,7 +179,6 @@ export const LightPanel = React.memo<Props>(props => { ...@@ -166,7 +179,6 @@ export const LightPanel = React.memo<Props>(props => {
function progressEnd(e) { function progressEnd(e) {
console.log(e, 'progressEnd'); console.log(e, 'progressEnd');
handleProgress(e); handleProgress(e);
} }
function handleProgress(e, isAction = true) { function handleProgress(e, isAction = true) {
...@@ -209,12 +221,31 @@ export const LightPanel = React.memo<Props>(props => { ...@@ -209,12 +221,31 @@ export const LightPanel = React.memo<Props>(props => {
></Image> ></Image>
</View> </View>
</View> </View>
<View <LampRectWhitePicker
className={styles.lightMiddle} canvasId="rectPicker"
onTouchStart={touchStart} rectWidth={336}
onTouchMove={handleTouch} rectHeight={155}
onTouchEnd={touchEnd} thumbWidth={14}
></View> temperature={temperature}
direction="right"
isShowColorTip={false}
containerStyle={{
borderRadius: '16px 16px 0 0',
overflow: 'hidden',
width:'336px',
height:'155px'
}}
onTouchStart={(_temp: number) => {
setTemp(_temp);
}}
onTouchMove={(_temp: number) => {
setTemp(_temp);
}}
onTouchEnd={(_temp: number) => {
setTemp(_temp);
temperatureAction.set(_temp);
}}
/>
<View <View
className={styles.progressBg} className={styles.progressBg}
onTouchStart={progressStart} onTouchStart={progressStart}
...@@ -242,11 +273,12 @@ export const LightPanel = React.memo<Props>(props => { ...@@ -242,11 +273,12 @@ export const LightPanel = React.memo<Props>(props => {
</View> </View>
</View> </View>
<View <View
className={styles.moveCircle} className={styles.modalback}
style={{ style={{
top: point.pageY - 14 + 'px', // background: 'rgba(0, 0, 0, 0.1)',
left: point.pageX - 14 + 'px', filter: 'blur(35px)',
backgroundColor: 'transparent', '-webkit-filter':'blur(35px)',
visibility: isShow ? 'visible' : 'hidden',
}} }}
></View> ></View>
</View> </View>
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
overflow-y: hidden;
} }
.header { .header {
......
...@@ -20,7 +20,7 @@ import { router, usePageEvent, setNavigationBarTitle, Slider } from '@ray-js/ray ...@@ -20,7 +20,7 @@ import { router, usePageEvent, setNavigationBarTitle, Slider } from '@ray-js/ray
import React from 'react'; import React from 'react';
import { useSelector } from '@/redux'; import { useSelector } from '@/redux';
import styles from './index.module.less'; import styles from './index.module.less';
import { Image} from '@ray-js/components'; import { Image } from '@ray-js/components';
import iconTempr from '../../../public/icon-temperature.png'; import iconTempr from '../../../public/icon-temperature.png';
import iconFanBg from '../../../public/icon-fan-bg.png'; import iconFanBg from '../../../public/icon-fan-bg.png';
import iconFan from '../../../public/icon-fan.png'; import iconFan from '../../../public/icon-fan.png';
...@@ -65,14 +65,14 @@ export function Home() { ...@@ -65,14 +65,14 @@ export function Home() {
return Boolean(props[fanSwitchCode]); return Boolean(props[fanSwitchCode]);
}); });
const fanSpeedVal = useSdmProps(props => { const fanSpeedVal = useSdmProps(props => {
return Number(props[fanSpeedCode]) return Number(props[fanSpeedCode]);
}); });
const [sliderValue, setSliderValue] = useState(fanSpeedVal); const [sliderValue, setSliderValue] = useState(fanSpeedVal);
useEffect(() => { useEffect(() => {
if (fanSpeedVal !== sliderValue) { if (fanSpeedVal !== sliderValue) {
setSliderValue(fanSpeedVal) setSliderValue(fanSpeedVal);
} }
}, [fanSpeedVal]) }, [fanSpeedVal]);
const fanModeVal = useSdmProps(props => props[fanModeCode]); const fanModeVal = useSdmProps(props => props[fanModeCode]);
const currentTempVal = useSdmProps(props => props[currentTempCode]); const currentTempVal = useSdmProps(props => props[currentTempCode]);
...@@ -83,8 +83,6 @@ export function Home() { ...@@ -83,8 +83,6 @@ export function Home() {
const speedAction = actions[fanSpeedCode] as DpCommonAction<number>; const speedAction = actions[fanSpeedCode] as DpCommonAction<number>;
const fanModeAction = actions[fanModeCode] as DpCommonAction<string>; const fanModeAction = actions[fanModeCode] as DpCommonAction<string>;
const menu = [ const menu = [
{ {
title: 'Switch', title: 'Switch',
...@@ -287,9 +285,18 @@ export function Home() { ...@@ -287,9 +285,18 @@ export function Home() {
); );
})} })}
</View> </View>
{menuIndex == 1 && (
<View className={styles.modalOverlay} onClick={toggleModal}> <View
<View className={styles.modalBg} onClick={stopFurtherClick}> className={styles.modalOverlay}
style={{ visibility: menuIndex == 1 ? 'visible' : 'hidden' }}
onClick={toggleModal}
>
<View
className={styles.modalBg}
style={{ visibility: menuIndex == 1 ? 'visible' : 'hidden' }}
onClick={stopFurtherClick}
>
{menuIndex == 1 && (
<Swiper dots={true} dotActiveColor="#6395F6" dotColor="rgba(99,149,246, 0.2)"> <Swiper dots={true} dotActiveColor="#6395F6" dotColor="rgba(99,149,246, 0.2)">
<SwiperItem> <SwiperItem>
<View className={styles.swiperItem}> <View className={styles.swiperItem}>
...@@ -302,27 +309,32 @@ export function Home() { ...@@ -302,27 +309,32 @@ export function Home() {
</View> </View>
</SwiperItem> </SwiperItem>
</Swiper> </Swiper>
</View> )}
</View> </View>
)} </View>
{menuIndex == 3 && ( {/* )} */}
<View className={styles.modalOverlay} onClick={toggleModal}> {/* {menuIndex == 3 && ( */}
<View <View
className={styles.modalBg} className={styles.modalOverlay}
style={{ style={{ visibility: menuIndex == 3 ? 'visible' : 'hidden' }}
height: '213px', onClick={toggleModal}
display: 'flex', >
flexDirection: 'column', <View
padding: '16px 16px 0', className={styles.modalBg}
gap: '12px', style={{
bottom: '140px', height: '213px',
}} display: 'flex',
onClick={stopFurtherClick} flexDirection: 'column',
> padding: '16px 16px 0',
<FanVertical></FanVertical> gap: '12px',
</View> bottom: '140px',
}}
onClick={stopFurtherClick}
>
<FanVertical></FanVertical>
</View> </View>
)} </View>
{/* )} */}
<LightPanel isShow={isShowModal} setModal={setModal}></LightPanel> <LightPanel isShow={isShowModal} setModal={setModal}></LightPanel>
</View> </View>
); );
......
...@@ -1809,6 +1809,14 @@ ...@@ -1809,6 +1809,14 @@
"@ray-js/framework" "^0.6.15" "@ray-js/framework" "^0.6.15"
"@ray-js/router" "^0.6.15" "@ray-js/router" "^0.6.15"
"@ray-js/api@^0.6.16":
version "0.6.16"
resolved "https://registry.npmmirror.com/@ray-js/api/-/api-0.6.16.tgz#6ff1abb6637c706638373b33e2a23d71f8293545"
integrity sha512-Bzaw01YZY3lKsmRokuzq2T0rF/SI5Tx5IRIb+Ipi7XIe+XiDW4Jlczmucx6ZKPVz+SqCqKMshFa8tDmoGRRSKw==
dependencies:
"@ray-js/framework" "^0.6.16"
"@ray-js/router" "^0.6.16"
"@ray-js/babel-preset-base@^0.6.15": "@ray-js/babel-preset-base@^0.6.15":
version "0.6.15" version "0.6.15"
resolved "https://registry.npmmirror.com/@ray-js/babel-preset-base/-/babel-preset-base-0.6.15.tgz" resolved "https://registry.npmmirror.com/@ray-js/babel-preset-base/-/babel-preset-base-0.6.15.tgz"
...@@ -1952,6 +1960,15 @@ ...@@ -1952,6 +1960,15 @@
commander "^8.2.0" commander "^8.2.0"
webpack-chain "^6.5.1" webpack-chain "^6.5.1"
"@ray-js/components-ty-lamp@^1.3.0":
version "1.3.0"
resolved "https://registry.npmmirror.com/@ray-js/components-ty-lamp/-/components-ty-lamp-1.3.0.tgz#69feca5d851669549be3bca4e85fd1b1f69d173a"
integrity sha512-HphyA3aHyLKLBVEizeO8VONZLNyOrbsS5/aLp8/LEPDT+n+/h88xCA63FIN8m7zn1pkhgZVa/bulxoxbqazEdg==
dependencies:
"@ray-js/lamp-circle-picker" "1.0.0"
"@ray-js/lamp-hue-picker" "1.0.0"
"@ray-js/lamp-rect-white-picker" "1.1.0"
"@ray-js/components@^0.6.15": "@ray-js/components@^0.6.15":
version "0.6.15" version "0.6.15"
resolved "https://registry.npmmirror.com/@ray-js/components/-/components-0.6.15.tgz" resolved "https://registry.npmmirror.com/@ray-js/components/-/components-0.6.15.tgz"
...@@ -1968,6 +1985,22 @@ ...@@ -1968,6 +1985,22 @@
react "^17.0.2" react "^17.0.2"
style-to-object "^0.3.0" style-to-object "^0.3.0"
"@ray-js/components@^0.6.16":
version "0.6.16"
resolved "https://registry.npmmirror.com/@ray-js/components/-/components-0.6.16.tgz#41624ed031f115ea5199274209c1e2e3ab6cd300"
integrity sha512-qdBr/ZW8lYLAetafFzykGaoLLr+FLueMVWk4fgHs5uxCxWS5I+SmESKFdBNjUkgebVdi7Ir4MDtiuMnChs64/Q==
dependencies:
"@ray-core/macro" "^0.0.x"
"@ray-core/wechat" "^0.0.x"
"@ray-js/framework-shared" "^0.6.16"
ahooks "^3.7.1"
clsx "^1.1.1"
core-js "^3.19.1"
hooks "^0.3.2"
param-case "^3.0.4"
react "^17.0.2"
style-to-object "^0.3.0"
"@ray-js/env-loader@^0.6.15": "@ray-js/env-loader@^0.6.15":
version "0.6.15" version "0.6.15"
resolved "https://registry.npmmirror.com/@ray-js/env-loader/-/env-loader-0.6.15.tgz" resolved "https://registry.npmmirror.com/@ray-js/env-loader/-/env-loader-0.6.15.tgz"
...@@ -1988,6 +2021,11 @@ ...@@ -1988,6 +2021,11 @@
resolved "https://registry.npmmirror.com/@ray-js/env/-/env-0.6.15.tgz" resolved "https://registry.npmmirror.com/@ray-js/env/-/env-0.6.15.tgz"
integrity sha512-zGuZZ4rgkV9Dtd6DsrsR8GZyhHp1Qo6tiL/4QJY0NBlZ9AALilMAZhfZishrv17tJS/zeE0WYyvqMEAVlHVIiA== integrity sha512-zGuZZ4rgkV9Dtd6DsrsR8GZyhHp1Qo6tiL/4QJY0NBlZ9AALilMAZhfZishrv17tJS/zeE0WYyvqMEAVlHVIiA==
"@ray-js/env@^0.6.16":
version "0.6.16"
resolved "https://registry.npmmirror.com/@ray-js/env/-/env-0.6.16.tgz#26b1951a0bb6a30fb6b5eaa90b84086c9b3c74e6"
integrity sha512-UzVBZ3PfldxYYMjktS4nXd1Ut9I3xL9SCWTt3WPQXcs7oPC2rSgWahdVwBVPH0QqcvXVuivPD+sCMEBaEnmcOw==
"@ray-js/framework-mp@^0.6.15": "@ray-js/framework-mp@^0.6.15":
version "0.6.15" version "0.6.15"
resolved "https://registry.npmmirror.com/@ray-js/framework-mp/-/framework-mp-0.6.15.tgz" resolved "https://registry.npmmirror.com/@ray-js/framework-mp/-/framework-mp-0.6.15.tgz"
...@@ -1995,6 +2033,13 @@ ...@@ -1995,6 +2033,13 @@
dependencies: dependencies:
"@ray-js/runtime" "^0.6.15" "@ray-js/runtime" "^0.6.15"
"@ray-js/framework-mp@^0.6.16":
version "0.6.16"
resolved "https://registry.npmmirror.com/@ray-js/framework-mp/-/framework-mp-0.6.16.tgz#f1fcb1aa63b5edee4545f3f6de1b86e692675893"
integrity sha512-ruEb216kVBieKa/8bwvCkRUqzavgCwmdWeAdVmnKFdiC+bNelxFD/K+niwJo/cfFSGxdMItT5oxGaEri9IApjw==
dependencies:
"@ray-js/runtime" "^0.6.16"
"@ray-js/framework-shared@^0.6.15": "@ray-js/framework-shared@^0.6.15":
version "0.6.15" version "0.6.15"
resolved "https://registry.npmmirror.com/@ray-js/framework-shared/-/framework-shared-0.6.15.tgz" resolved "https://registry.npmmirror.com/@ray-js/framework-shared/-/framework-shared-0.6.15.tgz"
...@@ -2003,6 +2048,14 @@ ...@@ -2003,6 +2048,14 @@
"@ray-core/wechat" "^0.0.x" "@ray-core/wechat" "^0.0.x"
"@ray-js/env" "^0.6.15" "@ray-js/env" "^0.6.15"
"@ray-js/framework-shared@^0.6.16":
version "0.6.16"
resolved "https://registry.npmmirror.com/@ray-js/framework-shared/-/framework-shared-0.6.16.tgz#ae5bc885ef3864d42663d7b8c9e26df9de7ebe88"
integrity sha512-O0XQoa6ys8iFoFfBbg9+mMHusSGr0zpmRsBCkGIQy/VpD1S4j258CGdmfaEiddPfSXtGjDSuyoMp7pe3DsfBPA==
dependencies:
"@ray-core/wechat" "^0.0.x"
"@ray-js/env" "^0.6.16"
"@ray-js/framework@^0.6.15": "@ray-js/framework@^0.6.15":
version "0.6.15" version "0.6.15"
resolved "https://registry.npmmirror.com/@ray-js/framework/-/framework-0.6.15.tgz" resolved "https://registry.npmmirror.com/@ray-js/framework/-/framework-0.6.15.tgz"
...@@ -2019,6 +2072,48 @@ ...@@ -2019,6 +2072,48 @@
lodash.get "^4.4.2" lodash.get "^4.4.2"
tiny-invariant "^1.1.0" tiny-invariant "^1.1.0"
"@ray-js/framework@^0.6.16":
version "0.6.16"
resolved "https://registry.npmmirror.com/@ray-js/framework/-/framework-0.6.16.tgz#089876782e222fb5385ff993933eeb31916582a1"
integrity sha512-EI1B4Xt2saxZHCsgMxMTydLpelWb0NCoFoLcpCnfmBI3WxdCcnkgmqGuKymmIHO8TRiYo/h5f9Ls51gqomeXhw==
dependencies:
"@ray-js/framework-mp" "^0.6.16"
"@ray-js/framework-shared" "^0.6.16"
"@ray-js/library" "^0.6.16"
"@ray-js/location" "^0.6.16"
"@ray-js/router" "^0.6.16"
"@ray-js/runtime" "^0.6.16"
clsx "^1.1.1"
hoist-non-react-statics "^3.3.2"
lodash.get "^4.4.2"
tiny-invariant "^1.1.0"
"@ray-js/lamp-circle-picker@1.0.0":
version "1.0.0"
resolved "https://registry.npmmirror.com/@ray-js/lamp-circle-picker/-/lamp-circle-picker-1.0.0.tgz#8c800f743e9d74c3f39819e2dbb69d34c3698e2f"
integrity sha512-OHylAKV9RMqEC1iupLBPCJcafARS8vZL9CcNK8ayLOs1/QGBJj7nVYjNejTE0T4XqWD7keXmfnmUX4Fy+hl5CA==
dependencies:
"@ray-js/panel-sdk" "^1.1.4"
clsx "^1.2.1"
"@ray-js/lamp-hue-picker@1.0.0":
version "1.0.0"
resolved "https://registry.npmmirror.com/@ray-js/lamp-hue-picker/-/lamp-hue-picker-1.0.0.tgz#d64e8e3579ccdb484dfc76b8e3fa3b34a248d637"
integrity sha512-oDz4tlma77mjBPCxVncfP5pQDKLqgr7o4lP8qWIUIhfuPQAc1Lo2wcUQk/fCQyTOQrmP+UZsZB5jGcWV5SumtQ==
dependencies:
"@ray-js/panel-sdk" "^1.1.4"
clsx "^1.2.1"
"@ray-js/lamp-rect-white-picker@1.1.0":
version "1.1.0"
resolved "https://registry.npmmirror.com/@ray-js/lamp-rect-white-picker/-/lamp-rect-white-picker-1.1.0.tgz#7d1719dad4a893af27cf1cd18ef767d48992b831"
integrity sha512-mCgqWQZs3iwl4Vua5aSCK+U56n+8xjffMFSbjAFYm4iC0nHngoTmfPjBecBXXzLU+bMvihG6PuWUkIaB7hg1ag==
dependencies:
"@ray-js/panel-sdk" "^1.1.4"
"@ray-js/ray" "^0.6.14"
clsx "^1.2.1"
color "0.11.4"
"@ray-js/library@^0.6.15": "@ray-js/library@^0.6.15":
version "0.6.15" version "0.6.15"
resolved "https://registry.npmmirror.com/@ray-js/library/-/library-0.6.15.tgz" resolved "https://registry.npmmirror.com/@ray-js/library/-/library-0.6.15.tgz"
...@@ -2026,6 +2121,13 @@ ...@@ -2026,6 +2121,13 @@
dependencies: dependencies:
merge "^2.1.1" merge "^2.1.1"
"@ray-js/library@^0.6.16":
version "0.6.16"
resolved "https://registry.npmmirror.com/@ray-js/library/-/library-0.6.16.tgz#4e4033a59f3269dbd4063d60e6c411255470cdcb"
integrity sha512-QypZ23zYVUnbregM6dms5XlyRhNwgCEEhUI+5/oheK9ZR51v2y1HHan0NISZ2yqVu0xnwtzKlZyghjDnd2gxeQ==
dependencies:
merge "^2.1.1"
"@ray-js/location@^0.6.15": "@ray-js/location@^0.6.15":
version "0.6.15" version "0.6.15"
resolved "https://registry.npmmirror.com/@ray-js/location/-/location-0.6.15.tgz" resolved "https://registry.npmmirror.com/@ray-js/location/-/location-0.6.15.tgz"
...@@ -2035,6 +2137,15 @@ ...@@ -2035,6 +2137,15 @@
"@ray-js/router" "^0.6.15" "@ray-js/router" "^0.6.15"
"@ray-js/router-mp" "^0.6.15" "@ray-js/router-mp" "^0.6.15"
"@ray-js/location@^0.6.16":
version "0.6.16"
resolved "https://registry.npmmirror.com/@ray-js/location/-/location-0.6.16.tgz#374ce6773f5f8b8e52bac731a6569f89d24396ee"
integrity sha512-8b9m2CirKBnZLDVtNGVMwaBxbH1ZV9VyS3Wt78HjOO0BjDOMy/zYlejbBFi/rD1rAmbi9CsbLYd5o8mNqFgdIw==
dependencies:
"@ray-js/library" "^0.6.16"
"@ray-js/router" "^0.6.16"
"@ray-js/router-mp" "^0.6.16"
"@ray-js/panel-cloud@^1.2.0": "@ray-js/panel-cloud@^1.2.0":
version "1.2.0" version "1.2.0"
resolved "https://registry.npmmirror.com/@ray-js/panel-cloud/-/panel-cloud-1.2.0.tgz#74f27abc1c04bf2a3a585402c40fb5305eddc20d" resolved "https://registry.npmmirror.com/@ray-js/panel-cloud/-/panel-cloud-1.2.0.tgz#74f27abc1c04bf2a3a585402c40fb5305eddc20d"
...@@ -2042,7 +2153,7 @@ ...@@ -2042,7 +2153,7 @@
dependencies: dependencies:
"@ray-js/panel-shared" "workspace:^1.2.0" "@ray-js/panel-shared" "workspace:^1.2.0"
"@ray-js/panel-sdk@^1.2.1": "@ray-js/panel-sdk@^1.1.4", "@ray-js/panel-sdk@^1.2.1":
version "1.2.1" version "1.2.1"
resolved "https://registry.npmmirror.com/@ray-js/panel-sdk/-/panel-sdk-1.2.1.tgz#ee49a3b5419249b157ef16f60b101b2e4f4be5af" resolved "https://registry.npmmirror.com/@ray-js/panel-sdk/-/panel-sdk-1.2.1.tgz#ee49a3b5419249b157ef16f60b101b2e4f4be5af"
integrity sha512-Oi7CPqXdRESbp7by5tbGa1wbXaoScaELwx3hanaSrLj65wtTEXfYVaPe1R+YKpPnjTKwiVFRqE+KR+GSjhDSTw== integrity sha512-Oi7CPqXdRESbp7by5tbGa1wbXaoScaELwx3hanaSrLj65wtTEXfYVaPe1R+YKpPnjTKwiVFRqE+KR+GSjhDSTw==
...@@ -2067,6 +2178,15 @@ ...@@ -2067,6 +2178,15 @@
"@ray-js/components" "^0.6.15" "@ray-js/components" "^0.6.15"
"@ray-js/framework" "^0.6.15" "@ray-js/framework" "^0.6.15"
"@ray-js/ray@^0.6.14":
version "0.6.16"
resolved "https://registry.npmmirror.com/@ray-js/ray/-/ray-0.6.16.tgz#fded5a3fe8771a2906b8cb713696176ad9eadaa2"
integrity sha512-mAGjkFDJM0uF6wBKkPVH/EPrdkB0YIa8ijcKbpx7+yqHTW92KI8y+GTXPLFSGdfr3VU1vbVgzM5Jhfdf0vyO1A==
dependencies:
"@ray-js/api" "^0.6.16"
"@ray-js/components" "^0.6.16"
"@ray-js/framework" "^0.6.16"
"@ray-js/router-mp@^0.6.15": "@ray-js/router-mp@^0.6.15":
version "0.6.15" version "0.6.15"
resolved "https://registry.npmmirror.com/@ray-js/router-mp/-/router-mp-0.6.15.tgz" resolved "https://registry.npmmirror.com/@ray-js/router-mp/-/router-mp-0.6.15.tgz"
...@@ -2079,6 +2199,18 @@ ...@@ -2079,6 +2199,18 @@
"@react-navigation/core" "^6.1.0" "@react-navigation/core" "^6.1.0"
path-to-regexp "^6.2.0" path-to-regexp "^6.2.0"
"@ray-js/router-mp@^0.6.16":
version "0.6.16"
resolved "https://registry.npmmirror.com/@ray-js/router-mp/-/router-mp-0.6.16.tgz#c7e5b63d049b73e0cf3b4bbc0783cc83009fe190"
integrity sha512-gQJbnAjGHsH1sH8yYehiQkIhKH1vn++Hlis68OBIAXM4GId7XVwihn3xI6YVM0jndHyqcc5I1pi9wSl/AwRsqw==
dependencies:
"@ray-js/api" "^0.6.16"
"@ray-js/env" "^0.6.16"
"@ray-js/library" "^0.6.16"
"@ray-js/types" "^0.6.16"
"@react-navigation/core" "^6.1.0"
path-to-regexp "^6.2.0"
"@ray-js/router@^0.6.15": "@ray-js/router@^0.6.15":
version "0.6.15" version "0.6.15"
resolved "https://registry.npmmirror.com/@ray-js/router/-/router-0.6.15.tgz" resolved "https://registry.npmmirror.com/@ray-js/router/-/router-0.6.15.tgz"
...@@ -2088,6 +2220,15 @@ ...@@ -2088,6 +2220,15 @@
"@ray-js/types" "^0.6.15" "@ray-js/types" "^0.6.15"
history "4.x" history "4.x"
"@ray-js/router@^0.6.16":
version "0.6.16"
resolved "https://registry.npmmirror.com/@ray-js/router/-/router-0.6.16.tgz#e3ceb2d4563e7175b7b93b018d1718f48bbb247a"
integrity sha512-c+PGVv5io/fyERUq17HUkxRKto6wYjsUGshnWadtme15vafzeQVdkKl8RdhsnsrJzTiAms8PAT5Q5MdxSpNQqA==
dependencies:
"@ray-js/library" "^0.6.16"
"@ray-js/types" "^0.6.16"
history "4.x"
"@ray-js/runtime@^0.6.15": "@ray-js/runtime@^0.6.15":
version "0.6.15" version "0.6.15"
resolved "https://registry.npmmirror.com/@ray-js/runtime/-/runtime-0.6.15.tgz" resolved "https://registry.npmmirror.com/@ray-js/runtime/-/runtime-0.6.15.tgz"
...@@ -2095,6 +2236,13 @@ ...@@ -2095,6 +2236,13 @@
dependencies: dependencies:
"@ray-core/runtime" "^0.0.x" "@ray-core/runtime" "^0.0.x"
"@ray-js/runtime@^0.6.16":
version "0.6.16"
resolved "https://registry.npmmirror.com/@ray-js/runtime/-/runtime-0.6.16.tgz#9d2d9611b2a4b0b3fd43186935691c021c6096df"
integrity sha512-U/LGQ9wjwMv2inpOR9/aEYLK49ZtzL+FEmEzD4miEkgcbNxLIIlZapSjH6+ooWrPkZLcGvYzqk8zeA6WZGTBFQ==
dependencies:
"@ray-core/runtime" "^0.0.x"
"@ray-js/shared@^0.6.15": "@ray-js/shared@^0.6.15":
version "0.6.15" version "0.6.15"
resolved "https://registry.npmmirror.com/@ray-js/shared/-/shared-0.6.15.tgz" resolved "https://registry.npmmirror.com/@ray-js/shared/-/shared-0.6.15.tgz"
...@@ -2117,6 +2265,13 @@ ...@@ -2117,6 +2265,13 @@
dependencies: dependencies:
path-to-regexp "^6.2.0" path-to-regexp "^6.2.0"
"@ray-js/types@^0.6.16":
version "0.6.16"
resolved "https://registry.npmmirror.com/@ray-js/types/-/types-0.6.16.tgz#7802b77f2104069232512e63dad0eaf28bc91a36"
integrity sha512-M6Zo1DJyTUBSz8GlXpxpurmY5fgYFrXB4WhrxmELPtG4j03Q9Era8i2vekaiqjGR7aXJj4N+EaQI7/JSrZtxHQ==
dependencies:
path-to-regexp "^6.2.0"
"@react-navigation/core@^6.1.0": "@react-navigation/core@^6.1.0":
version "6.4.0" version "6.4.0"
resolved "https://registry.npmmirror.com/@react-navigation/core/-/core-6.4.0.tgz" resolved "https://registry.npmmirror.com/@react-navigation/core/-/core-6.4.0.tgz"
...@@ -3984,7 +4139,7 @@ collection-visit@^1.0.0: ...@@ -3984,7 +4139,7 @@ collection-visit@^1.0.0:
map-visit "^1.0.0" map-visit "^1.0.0"
object-visit "^1.0.0" object-visit "^1.0.0"
color-convert@^1.9.0: color-convert@^1.3.0, color-convert@^1.9.0:
version "1.9.3" version "1.9.3"
resolved "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz" resolved "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz"
integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
...@@ -4003,16 +4158,32 @@ color-name@1.1.3: ...@@ -4003,16 +4158,32 @@ color-name@1.1.3:
resolved "https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz" resolved "https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz"
integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
color-name@~1.1.4: color-name@^1.0.0, color-name@~1.1.4:
version "1.1.4" version "1.1.4"
resolved "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz" resolved "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz"
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
color-string@^0.3.0:
version "0.3.0"
resolved "https://registry.npmmirror.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
integrity sha512-sz29j1bmSDfoAxKIEU6zwoIZXN6BrFbAMIhfYCNyiZXBDuU/aiHlN84lp/xDzL2ubyFhLDobHIlU1X70XRrMDA==
dependencies:
color-name "^1.0.0"
color-support@^1.1.2: color-support@^1.1.2:
version "1.1.3" version "1.1.3"
resolved "https://registry.npmmirror.com/color-support/-/color-support-1.1.3.tgz" resolved "https://registry.npmmirror.com/color-support/-/color-support-1.1.3.tgz"
integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
color@0.11.4:
version "0.11.4"
resolved "https://registry.npmmirror.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
integrity sha512-Ajpjd8asqZ6EdxQeqGzU5WBhhTfJ/0cA4Wlbre7e5vXfmDSmda7Ov6jeKoru+b0vHcb1CqvuroTHp5zIWzhVMA==
dependencies:
clone "^1.0.2"
color-convert "^1.3.0"
color-string "^0.3.0"
colorette@^2.0.10, colorette@^2.0.16: colorette@^2.0.10, colorette@^2.0.16:
version "2.0.19" version "2.0.19"
resolved "https://registry.npmmirror.com/colorette/-/colorette-2.0.19.tgz" resolved "https://registry.npmmirror.com/colorette/-/colorette-2.0.19.tgz"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment