diff --git a/samples/inputs/circular-progress-indicator/dynamic/src/DynamicCircularProgressStyle.css b/samples/inputs/circular-progress-indicator/dynamic/src/DynamicCircularProgressStyle.css
index b5b21b6e2f..e05d779cfd 100644
--- a/samples/inputs/circular-progress-indicator/dynamic/src/DynamicCircularProgressStyle.css
+++ b/samples/inputs/circular-progress-indicator/dynamic/src/DynamicCircularProgressStyle.css
@@ -1,4 +1,21 @@
 igc-circular-progress {
     --diameter: 100px;
     --stroke-thickness: 5px;
+}
+
+.sample-content {
+    width: 300px;
+    display: flex;
+    align-items: center;
+    margin-top: 30px;
+}
+
+.circular-progress-container {
+    margin-right: 50px;
+    margin-left: 20px;
+}
+
+.buttons-container {
+    display: flex;
+    gap: 10px;
 }
\ No newline at end of file
diff --git a/samples/inputs/circular-progress-indicator/dynamic/src/index.tsx b/samples/inputs/circular-progress-indicator/dynamic/src/index.tsx
index 92eee138bc..9ec6e04d48 100644
--- a/samples/inputs/circular-progress-indicator/dynamic/src/index.tsx
+++ b/samples/inputs/circular-progress-indicator/dynamic/src/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import ReactDOM from 'react-dom/client';
 import './index.css';
 import { IgrCircularProgress, IgrCircularGradient, IgrIconButton, IgrCircularProgressModule, IgrCircularGradientModule, IgrIconButtonModule, registerIconFromText } from 'igniteui-react';
@@ -12,70 +12,53 @@ IgrIconButtonModule.register();
 const addIconText = '<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>';
 const removeIconText = '<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M19 13H5v-2h14v2z"/></svg>';
 
-export default class DynamicCircularProgress extends React.Component<any, any> {
+export default function DynamicCircularProgress() {
 
-    public circularProgress: IgrCircularProgress;
-    public addIcon: IgrIconButton;
-    public removeIcon: IgrIconButton;
+    const [currentValue, setCurrentValue] = useState<number>(0);
 
-    constructor(props: any) {
-        super(props);
+    useEffect(() => {
+        registerIconFromText("add", addIconText, "material");
+        registerIconFromText("remove", removeIconText, "material");
+    }, []);
 
-        registerIconFromText(
-            "add", addIconText, "material"
-        );
-        registerIconFromText(
-            "remove", removeIconText, "material"
-        );
-
-        this.circularProgressRef = this.circularProgressRef.bind(this);
-        this.onIconClick = this.onIconClick.bind(this);  
-    }
-
-    public render(): JSX.Element {
-        return (
-            <div style={{width: "300px", display: "flex", alignItems: "center", marginTop: "30px"}}>
-                <IgrCircularProgress ref={this.circularProgressRef} style={{marginRight: "50px", marginLeft: "20px"}} max={100} value={100}>
-                    <IgrCircularGradient offset="0%" color="#ff9a40">
-                    </IgrCircularGradient>
-                    <IgrCircularGradient offset="50%" color="#1eccd4">
-                    </IgrCircularGradient>
-                    <IgrCircularGradient offset="100%" color="#ff0079">
-                    </IgrCircularGradient>
-                </IgrCircularProgress>
-                <div style={{display: "flex", justifyContent: "space evenly", marginTop: "20px"}} onClick={this.onIconClick}>
-                    <IgrIconButton className="removeIcon" name="remove" collection="material">
-                    </IgrIconButton>
-                    <IgrIconButton className="addIcon" name="add" collection="material">
-                    </IgrIconButton>
-                </div>
-            </div>
-        );
-    }
-
-    public circularProgressRef(progress: IgrCircularProgress)
-    {
-        if(!progress) { return; }
-        this.circularProgress = progress;
+    const incrementProgress = () => {
+        setCurrentValue((oldValue) => {
+           const newValue = oldValue + 10;
+           if (newValue > 100) {
+             return 100;
+           }
+            return newValue;
+        });
     }
 
-    public onIconClick(e: any) {
-        const target = e.target as HTMLElement;
-        const iconButton: any = target.closest('igc-icon-button');
-        if(iconButton.getAttribute("classname") === "removeIcon")
-        {
-            if(this.circularProgress.value > 0) {
-                this.circularProgress.value = this.circularProgress.value - 10;
-            }
-            else {
-                this.circularProgress.value = 0;
+    const decrementProgress = () => {
+        setCurrentValue((oldValue) => {
+            const newValue = oldValue - 10;
+            if (newValue < 0) {
+              return 0;
             }
-        }
-        else {
-            this.circularProgress.value = this.circularProgress.value + 10;
-        }
-
+             return newValue;
+        });
     }
+
+    return (
+        <div className="sample-content">
+            <IgrCircularProgress className="circular-progress-container" max={100} value={currentValue}>
+                <IgrCircularGradient slot="gradient" offset="0%" color="#ff9a40">
+                </IgrCircularGradient>
+                <IgrCircularGradient slot="gradient" offset="50%" color="#1eccd4">
+                </IgrCircularGradient>
+                <IgrCircularGradient slot="gradient" offset="100%" color="#ff0079">
+                </IgrCircularGradient>
+            </IgrCircularProgress>
+            <div className="buttons-container">
+                <IgrIconButton className="removeIcon" name="remove" collection="material" onClick={decrementProgress}>
+                </IgrIconButton>
+                <IgrIconButton className="addIcon" name="add" collection="material" onClick={incrementProgress}>
+                </IgrIconButton>
+            </div>
+        </div>
+    );
 }
 
 // rendering above class to the React DOM