Skip to content

Commit e30d368

Browse files
ANKUR DWIVEDIANKUR DWIVEDI
authored andcommitted
updated ikContextprops
1 parent b52edf7 commit e30d368

4 files changed

Lines changed: 20 additions & 12 deletions

File tree

src/components/IKContext/index.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
import React, { createContext } from 'react';
33
import { InferProps } from 'prop-types';
44
import ImageKit from 'imagekit-javascript';
5-
import { IKContextCombinedProps } from "./props";
5+
import { IKContextCombinedProps, IKContextExtractedProps } from "./props";
66

77
// Create the context
8-
export const ImageKitContext = createContext<IKContextCombinedProps>({});
8+
export const ImageKitContext = createContext<IKContextExtractedProps>({});
99

1010
/**
1111
* Provides a container for ImageKit components. Any option set in IKContext will be passed to the children.
@@ -18,16 +18,16 @@ export const ImageKitContext = createContext<IKContextCombinedProps>({});
1818
*/
1919
const IKContext = (props: React.PropsWithChildren<IKContextCombinedProps>) => {
2020

21-
const extractContextOptions = (mergedOptions: InferProps<IKContextCombinedProps>) => {
22-
var result: IKContextCombinedProps = {};
21+
const extractContextOptions = (mergedOptions: InferProps<IKContextExtractedProps>) => {
22+
var result: IKContextExtractedProps = {};
2323

24-
const propKeys = Object.keys(IKContextCombinedProps);
24+
const propKeys = Object.keys(IKContextExtractedProps);
2525

2626
for (var i = 0; i < propKeys.length; i++) {
2727
var key = propKeys[i];
28-
const value = mergedOptions[key as keyof IKContextCombinedProps];
28+
const value = mergedOptions[key as keyof IKContextExtractedProps];
2929
if (value) {
30-
result[key as keyof IKContextCombinedProps] = value;
30+
result[key as keyof IKContextExtractedProps] = value;
3131
}
3232
}
3333

src/components/IKContext/props.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ const Props = {
1010
export const IKContextCombinedProps = {
1111
...Props,
1212
transformationPosition: PropTypes.oneOf(['path', 'query']),
13+
};
14+
15+
export const IKContextExtractedProps = {
16+
...IKContextCombinedProps,
1317
ikClient: PropTypes.instanceOf(ImageKit),
1418
};
1519

@@ -19,4 +23,8 @@ export type IKContextCombinedProps = InferProps<typeof IKContextCombinedProps> &
1923

2024
export type IKContextBaseProps = InferProps<typeof Props>;
2125

26+
export type IKContextExtractedProps = InferProps<typeof IKContextExtractedProps> & {
27+
urlEndpoint?: string;
28+
};
29+
2230
export default Props;

src/components/IKVideo/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import React, { useContext, useEffect, useRef, useState } from 'react';
2-
import { IKContextBaseProps, IKContextCombinedProps } from "../IKContext/props";
2+
import { IKContextBaseProps, IKContextExtractedProps } from "../IKContext/props";
33
import COMBINED_PROP_TYPES, { IKVideoProps } from './combinedProps';
44
import { getSrc } from '../../utils/Utility';
55
import useImageKitComponent from '../ImageKitComponent';
66
import { ImageKitContext } from '../IKContext';
77

88
export type IKVideoState = {
99
currentUrl?: string;
10-
contextOptions: IKContextCombinedProps;
10+
contextOptions: IKContextExtractedProps;
1111
};
1212

1313
const IKVideo = (props: IKVideoProps & IKContextBaseProps) => {

src/utils/Utility.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import ImageKit from "imagekit-javascript";
22
import { TransformationPosition, UrlOptions } from "imagekit-javascript/dist/src/interfaces";
3-
import { IKContextCombinedProps, IKContextBaseProps } from "../components/IKContext/props";
3+
import { IKContextBaseProps, IKContextExtractedProps } from "../components/IKContext/props";
44
import { IKImageProps, IKImageBaseProps } from "../components/IKImage/combinedProps";
55
import { IKVideoBaseProps } from "../components/IKVideo/combinedProps";
66

@@ -11,7 +11,7 @@ export type IKImageState = {
1111
lqipSrc?: string;
1212
originalSrcLoaded: boolean;
1313
intersected: boolean;
14-
contextOptions: IKContextCombinedProps;
14+
contextOptions: IKContextExtractedProps;
1515
observe?: IntersectionObserver;
1616
initialzeState: boolean
1717
}
@@ -36,7 +36,7 @@ export const areObjectsDifferent = <T>(prevProps: T, newProps: T, propsAffecting
3636
type GetSrcReturnType = {originalSrc: string; lqipSrc?: string;};
3737

3838
export const getSrc = ({ urlEndpoint, lqip, src, path, transformation, transformationPosition, queryParameters }: IKImageBaseProps & IKVideoBaseProps & IKContextBaseProps,
39-
ikClient: ImageKit, contextOptions: IKContextCombinedProps): GetSrcReturnType => {
39+
ikClient: ImageKit, contextOptions: IKContextExtractedProps): GetSrcReturnType => {
4040

4141
let options: UrlOptions;
4242
if (src) {

0 commit comments

Comments
 (0)